Tarball conversion

30 files changed, 400718 insertions, 0 deletions

diff --git a/po/ar.po b/po/ar.po
new file mode 100644
index 0000000..f7179bd
--- /dev/null
+++ b/po/ar.po
@@ -0,0 +1,13238 @@
+# Arabic translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-02-21 11:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic <ar@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
+"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:50+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/ast.po b/po/ast.po
new file mode 100644
index 0000000..95bd626
--- /dev/null
+++ b/po/ast.po
@@ -0,0 +1,13252 @@
+# Asturian translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Asturian <ast@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:18+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr "saltando {0} (mayor que {1} de {2} bytes)"
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "error alcontráu: %s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr "bzr %s --revision toma exactamente un identificador de revisión"
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr "Amosar resume d'estáu."
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"Esto ye un informe de ficheros con versiones y desconocíos,\n"
+"presentándolos agrupaos pol estáu. Los estaos posibles son:"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+"amestáu\n"
+"    Con versión na copia de trabayu pero non na revisión anterior."
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+"desaniciáu\n"
+"    Con versión na revisión anterior pero quitáu o desaniciáu\n"
+"    na copia de trabayu."
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+"renomáu\n"
+"    El camín a esti ficheru camudó dende la revisión anterior;\n"
+"    seique camudara tamién el testu. Esto incluye los ficheros\n"
+"    pa los que camudó'l nome del direutoriu pá."
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+"camudáu\n"
+"    El testu camudó dende la cabera revisión."
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+"camudó la clase\n"
+"    La clase de ficheru camudó (p.ex. de ficheru a direutoriu)."
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/bs.po b/po/bs.po
new file mode 100644
index 0000000..eb375ff
--- /dev/null
+++ b/po/bs.po
@@ -0,0 +1,13238 @@
+# Bosnian translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:18+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/bzr.pot b/po/bzr.pot
new file mode 100644
index 0000000..539b1cd
--- /dev/null
+++ b/po/bzr.pot
@@ -0,0 +1,13574 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
+"POT-Creation-Date: 2012-07-10 11:35+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: bzrlib/add.py:93
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:854
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:2955
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:2957
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:2960
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:2962
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:2982
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:2985
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:260
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:317
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:327
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:332
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:335
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:338
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:349
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:353
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:358
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:366
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+# help of 'short' option of 'status' command
+#: bzrlib/builtins.py:375
+msgid "Use short status indicators."
+msgstr ""
+
+# help of 'versioned' option of 'status' command
+#: bzrlib/builtins.py:377
+msgid "Only show versioned files."
+msgstr ""
+
+# help of 'no-pending' option of 'status' command
+#: bzrlib/builtins.py:379
+msgid "Don't show pending merges."
+msgstr ""
+
+# help of 'no-classify' option of 'status' command
+#: bzrlib/builtins.py:382
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:397
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:451
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:462
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:469
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:561
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:563
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:566
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+# help of 'force' option of 'remove-tree' command
+#: bzrlib/builtins.py:572
+msgid "Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:586
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:588
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:597
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:637
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:648
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:652
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:656
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:658
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:671
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+# help of 'tree' option of 'revno' command
+#: bzrlib/builtins.py:712
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:760
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:766
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:774
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:777
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:780
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:785
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:788
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:796
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:799
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+# help of 'no-recurse' option of 'add' command
+#: bzrlib/builtins.py:806
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+# help of 'file-ids-from' option of 'add' command
+#: bzrlib/builtins.py:813
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:849
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:854
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:856
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+# help of 'parents' option of 'mkdir' command
+#: bzrlib/builtins.py:863
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:897
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:939
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:976
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:978
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:980
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:990
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+# help of 'after' option of 'mv' command
+#: bzrlib/builtins.py:997
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+# help of 'auto' option of 'mv' command
+#: bzrlib/builtins.py:999
+msgid "Automatically guess renames."
+msgstr ""
+
+# help of 'dry-run' option of 'mv' command
+#: bzrlib/builtins.py:1000
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:1009
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1017
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1023
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1026
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1062
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1114
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1116
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1121
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1125
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1129
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1138
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+# help of 'verbose' option of 'pull' command
+#: bzrlib/builtins.py:1146
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+# help of 'directory' option of 'pull' command
+#: bzrlib/builtins.py:1148
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+# help of 'local' option of 'pull' command
+#: bzrlib/builtins.py:1151
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1189
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1205
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1211
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1261
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1263
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1266
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1269
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1273
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1280
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1285
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+# help of 'directory' option of 'dpush' command
+# help of 'directory' option of 'push' command
+#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+# help of 'use-existing-dir' option of 'push' command
+#: bzrlib/builtins.py:1299
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+# help of 'stacked' option of 'push' command
+#: bzrlib/builtins.py:1304
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+# help of 'stacked-on' option of 'push' command
+#: bzrlib/builtins.py:1307
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+# help of 'strict' option of 'dpush' command
+# help of 'strict' option of 'push' command
+#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+# help of 'no-tree' option of 'push' command
+#: bzrlib/builtins.py:1315
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+# help of 'overwrite-tags' option of 'pull' command
+# help of 'overwrite-tags' option of 'push' command
+#: bzrlib/builtins.py:1318
+msgid "Overwrite tags only."
+msgstr ""
+
+#: bzrlib/builtins.py:1369
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1378
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1388
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1400
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create ./"
+"bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1407
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1410
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+# help of 'no-tree' option of 'branch' command
+#: bzrlib/builtins.py:1420
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+# help of 'switch' option of 'branch' command
+#: bzrlib/builtins.py:1422
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+# help of 'stacked' option of 'branch' command
+#: bzrlib/builtins.py:1425
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+# help of 'standalone' option of 'branch' command
+#: bzrlib/builtins.py:1429
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+# help of 'use-existing-dir' option of 'branch' command
+#: bzrlib/builtins.py:1431
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+# help of 'bind' option of 'branch' command
+#: bzrlib/builtins.py:1436
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1483
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1495
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1514
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1529 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1533
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1538
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1548
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1550
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+# help of 'recursive' option of 'branches' command
+#: bzrlib/builtins.py:1557
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1586
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1598
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1600
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1605
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create ./"
+"bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1612
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+# help of 'lightweight' option of 'checkout' command
+#: bzrlib/builtins.py:1622
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+# help of 'files-from' option of 'branch' command
+# help of 'files-from' option of 'checkout' command
+#: bzrlib/builtins.py:1629
+msgid "Get file contents from this tree."
+msgstr ""
+
+# help of 'hardlink' option of 'branch' command
+# help of 'hardlink' option of 'checkout' command
+#: bzrlib/builtins.py:1631
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1700
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1702
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1706
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1709
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1714
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1717
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1724
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1740
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1748
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1779
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1795
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1814
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1816
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1819
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1823
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
+#: bzrlib/builtins.py:6466
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1827
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1829
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1831
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1835
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1837
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1839
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1858
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1860
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extension of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+# help of 'new' option of 'remove' command
+#: bzrlib/builtins.py:1868
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+# help of 'file-deletion-strategy' option of 'remove' command
+#: bzrlib/builtins.py:1870
+msgid "The file deletion mode to be used."
+msgstr ""
+
+# title of 'file-deletion-strategy' option of 'remove' command
+#: bzrlib/builtins.py:1871
+msgid "Deletion Strategy"
+msgstr ""
+
+# help of 'file-deletion-strategy=safe' option of 'remove' command
+#: bzrlib/builtins.py:1872
+msgid "Backup changed files (default)."
+msgstr ""
+
+# help of 'file-deletion-strategy=keep' option of 'remove' command
+#: bzrlib/builtins.py:1873
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+# help of 'file-deletion-strategy=no-backup' option of 'remove' command
+#: bzrlib/builtins.py:1874
+msgid "Don't backup changed files."
+msgstr ""
+
+# help of 'file-deletion-strategy=force' option of 'remove' command
+#: bzrlib/builtins.py:1875
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1884
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1901
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1962
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1964
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1969
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1974
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1977
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+# help of 'format=2a' option of 'init' command
+# help of 'format=default' option of 'init' command
+# help of 'format=2a' option of 'init-repository' command
+# help of 'format=default' option of 'init-repository' command
+# help of 'format=2a' option of 'upgrade' command
+# help of 'format=default' option of 'upgrade' command
+#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+# help of 'format=pack-0.92' option of 'init' command
+# help of 'format=pack-0.92' option of 'init-repository' command
+# help of 'format=pack-0.92' option of 'upgrade' command
+#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+# help of 'format=development-colo' option of 'init' command
+# help of 'format=development-colo' option of 'init-repository' command
+# help of 'format=development-colo' option of 'upgrade' command
+#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2045
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2047
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2050
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2058
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2060
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+# help of 'create-prefix' option of 'init' command
+# help of 'create-prefix' option of 'push' command
+#: bzrlib/builtins.py:2071
+msgid "Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+# help of 'format' option of 'init' command
+#: bzrlib/builtins.py:2074
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+# help of 'append-revisions-only' option of 'init' command
+#: bzrlib/builtins.py:2082
+msgid "Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+# help of 'no-tree' option of 'init' command
+#: bzrlib/builtins.py:2085
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2105 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2139
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2159
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2165
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2170
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2177
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2180
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2183
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2185
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+# help of 'format' option of 'init-repository' command
+#: bzrlib/builtins.py:2193
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+# title of 'format' option of 'init-repository' command
+#: bzrlib/builtins.py:2197
+msgid "Repository format"
+msgstr ""
+
+# help of 'no-trees' option of 'init-repository' command
+#: bzrlib/builtins.py:2199
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2234
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2244
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2250
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2253
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2255
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2257
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2259
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2261
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2263
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2265
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2267
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2269
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2271
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2275
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2279
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2281
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2286
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2288
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2292
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2296
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2298
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2302
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2304
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+# help of 'diff-options' option of 'diff' command
+#: bzrlib/builtins.py:2314
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+# help of 'prefix' option of 'diff' command
+#: bzrlib/builtins.py:2317
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+# help of 'old' option of 'diff' command
+#: bzrlib/builtins.py:2320
+msgid "Branch/tree to compare from."
+msgstr ""
+
+# help of 'new' option of 'diff' command
+#: bzrlib/builtins.py:2324
+msgid "Branch/tree to compare to."
+msgstr ""
+
+# help of 'using' option of 'diff' command
+#: bzrlib/builtins.py:2330
+msgid "Use this command to compare files."
+msgstr ""
+
+# help of 'format' option of 'diff' command
+#: bzrlib/builtins.py:2335
+msgid "Diff format to use."
+msgstr ""
+
+# title of 'format' option of 'diff' command
+#: bzrlib/builtins.py:2337
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2359
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2363
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
+#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2388
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2465
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2467
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2482
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2490
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2495
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2497
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2502
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2506
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2513
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2523
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2529
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2533
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2537
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2539
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2546
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2549
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2554
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2557
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2564
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2573
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2581
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2584
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2588
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2590
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2592
+msgid "  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2594
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2597
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2600
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2604
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2606
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2612
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2614
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2620
+msgid "  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2622
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2631
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2634
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2639
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2644
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+# help of 'forward' option of 'log' command
+#: bzrlib/builtins.py:2653
+msgid "Show from oldest to newest."
+msgstr ""
+
+# help of 'verbose' option of 'log' command
+#: bzrlib/builtins.py:2656
+msgid "Show files changed in each revision."
+msgstr ""
+
+# help of 'change' option of 'log' command
+#: bzrlib/builtins.py:2662
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+# help of 'authors' option of 'log' command
+#: bzrlib/builtins.py:2666
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+# title of 'authors' option of 'log' command
+#: bzrlib/builtins.py:2667
+msgid "Authors"
+msgstr ""
+
+# help of 'levels' option of 'log' command
+#: bzrlib/builtins.py:2672
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+# help of 'limit' option of 'log' command
+#: bzrlib/builtins.py:2682
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+# help of 'show-diff' option of 'log' command
+#: bzrlib/builtins.py:2687
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+# help of 'include-merged' option of 'log' command
+#: bzrlib/builtins.py:2689
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+# help of 'omit-merges' option of 'log' command
+#: bzrlib/builtins.py:2693
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+# help of 'exclude-common-ancestry' option of 'log' command
+#: bzrlib/builtins.py:2695
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+# help of 'signatures' option of 'log' command
+#: bzrlib/builtins.py:2699
+msgid "Show digital signature validity."
+msgstr ""
+
+# help of 'match' option of 'log' command
+#: bzrlib/builtins.py:2702
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+# help of 'match-message' option of 'log' command
+#: bzrlib/builtins.py:2706
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+# help of 'match-committer' option of 'log' command
+#: bzrlib/builtins.py:2710
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+# help of 'match-author' option of 'log' command
+#: bzrlib/builtins.py:2714
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+# help of 'match-bugs' option of 'log' command
+#: bzrlib/builtins.py:2718
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2772
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2800
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2917
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2933
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2978
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+# help of 'recursive' option of 'ls' command
+#: bzrlib/builtins.py:2987
+msgid "Recurse into subdirectories."
+msgstr ""
+
+# help of 'from-root' option of 'ls' command
+#: bzrlib/builtins.py:2989
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+# help of 'unknown' option of 'ls' command
+#: bzrlib/builtins.py:2991
+msgid "Print unknown files."
+msgstr ""
+
+# help of 'versioned' option of 'ls' command
+#: bzrlib/builtins.py:2992
+msgid "Print versioned files."
+msgstr ""
+
+# help of 'ignored' option of 'ls' command
+#: bzrlib/builtins.py:2995
+msgid "Print ignored files."
+msgstr ""
+
+# help of 'kind' option of 'ls' command
+#: bzrlib/builtins.py:2997
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:3010
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:3013
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:3022
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3109
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3111
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3124
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3130
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3134
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3137
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3142
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3145
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3148
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3150
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3152
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3154
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3156
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3158
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3160
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3164
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3168
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3170
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3172
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+# help of 'default-rules' option of 'ignore' command
+#: bzrlib/builtins.py:3186
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3198
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3218
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3231
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3238
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3240
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3243
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3245
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3279
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3286
+msgid "Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3290
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3294
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3298
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3301
+msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3303
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+# help of 'format' option of 'export' command
+#: bzrlib/builtins.py:3317
+msgid "Type of file to export to."
+msgstr ""
+
+# help of 'filters' option of 'export' command
+#: bzrlib/builtins.py:3320
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+# help of 'root' option of 'export' command
+#: bzrlib/builtins.py:3324
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+# help of 'per-file-timestamps' option of 'export' command
+#: bzrlib/builtins.py:3326
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+# help of 'uncommitted' option of 'export' command
+#: bzrlib/builtins.py:3329
+msgid "Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3348
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3357
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3361
+msgid "Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3363
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3365
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+# help of 'name-from-revision' option of 'cat' command
+#: bzrlib/builtins.py:3371
+msgid "The path name in the old tree."
+msgstr ""
+
+# help of 'filters' option of 'cat' command
+#: bzrlib/builtins.py:3372
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3383
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3445
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3456
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3462
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3466
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3468
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3470
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3472
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3479
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3481
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3487
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3493
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+# help of 'exclude' option of 'commit' command
+#: bzrlib/builtins.py:3503
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+# help of 'message' option of 'commit' command
+#: bzrlib/builtins.py:3506
+msgid "Description of the new revision."
+msgstr ""
+
+# help of 'unchanged' option of 'commit' command
+#: bzrlib/builtins.py:3509
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+# help of 'file' option of 'commit' command
+#: bzrlib/builtins.py:3513
+msgid "Take commit message from this file."
+msgstr ""
+
+# help of 'strict' option of 'commit' command
+#: bzrlib/builtins.py:3515
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+# help of 'commit-time' option of 'commit' command
+#: bzrlib/builtins.py:3518
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+# help of 'fixes' option of 'commit' command
+#: bzrlib/builtins.py:3521
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+# help of 'author' option of 'commit' command
+#: bzrlib/builtins.py:3524
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+# help of 'local' option of 'commit' command
+#: bzrlib/builtins.py:3527
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+# help of 'show-diff' option of 'commit' command
+#: bzrlib/builtins.py:3533
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+# help of 'lossy' option of 'commit' command
+#: bzrlib/builtins.py:3536
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3554
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3563
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3572
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3575
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3599
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3668
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3671
+msgid ""
+"Empty commit message specified. Please specify a commit message with either "
+"--message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3691
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use "
+"--unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3695
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3699
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3710
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3715
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3718
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3722
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3726
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3731
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3741
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3746
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3748
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3750
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3752
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3754
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3756
+msgid "        bzr check baz"
+msgstr ""
+
+# help of 'branch' option of 'check' command
+#: bzrlib/builtins.py:3762
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+# help of 'repo' option of 'check' command
+#: bzrlib/builtins.py:3764
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+# help of 'tree' option of 'check' command
+#: bzrlib/builtins.py:3766
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3780
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3782
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3788
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3803
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3808
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+# help of 'format' option of 'upgrade' command
+#: bzrlib/builtins.py:3816
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+# title of 'format' option of 'init' command
+# title of 'format' option of 'upgrade' command
+#: bzrlib/builtins.py:3820
+msgid "Branch format"
+msgstr ""
+
+# help of 'clean' option of 'upgrade' command
+#: bzrlib/builtins.py:3822
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+# help of 'dry-run' option of 'add' command
+# help of 'dry-run' option of 'upgrade' command
+#: bzrlib/builtins.py:3824
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3839
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3841
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3844
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3846
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3848
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+# help of 'email' option of 'whoami' command
+#: bzrlib/builtins.py:3852
+msgid "Display email address only."
+msgstr ""
+
+# help of 'branch' option of 'whoami' command
+#: bzrlib/builtins.py:3854
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3880
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3904
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3906
+msgid ""
+"If unset, the colocated branch name is used for colocated branches, and\n"
+"the branch directory name is used for other branches.  To print the\n"
+"current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3910
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3930
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3932
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3935
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3937
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3939
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3941
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3943
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3945
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3947
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+# help of 'remove' option of 'alias' command
+#: bzrlib/builtins.py:3952
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3970
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4151
+msgid "subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4168
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4215
+msgid "Show version of bzr."
+msgstr ""
+
+# help of 'short' option of 'version' command
+#: bzrlib/builtins.py:4219
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4238
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4262
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4276
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4280
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4291
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4298
+msgid "Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4300
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4309
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4315
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4319
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4325
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4327
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4329
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4331
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4333
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4342
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+# help of 'force' option of 'merge' command
+#: bzrlib/builtins.py:4354
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+# help of 'uncommitted' option of 'merge' command
+#: bzrlib/builtins.py:4360
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+# help of 'pull' option of 'merge' command
+#: bzrlib/builtins.py:4362
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+# help of 'directory' option of 'merge' command
+#: bzrlib/builtins.py:4367
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+# help of 'preview' option of 'merge' command
+#: bzrlib/builtins.py:4369
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+# help of 'interactive' option of 'merge' command
+#: bzrlib/builtins.py:4371
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4393
+msgid ""
+"Merging into empty branches not currently supported, https://bugs.launchpad."
+"net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4420
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4431
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4451
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4457
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4465
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4523
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4532
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4536
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4647
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4655
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4657
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4665
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4669
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4671
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4674
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+# help of 'show-base' option of 'merge' command
+# help of 'show-base' option of 'pull' command
+# help of 'show-base' option of 'remerge' command
+# help of 'show-base' option of 'update' command
+#: bzrlib/builtins.py:4681
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4693
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4751
+msgid ""
+"Set files in the working tree back to the contents of a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4753
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"working tree basis revision is used. A revert operation affects only the\n"
+"working tree, not any revision history like the branch and repository or\n"
+"the working tree basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4759
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
+"To update the branch to a specific revision or the latest revision and\n"
+"update the working tree accordingly while preserving local changes, see the\n"
+"update command."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid ""
+"Uncommitted changes to files that are reverted will be discarded.\n"
+"Howver, by default, any files that have been manually changed will be\n"
+"backed up first.  (Files changed only by merge are not backed up.)  Backup\n"
+"files have '.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4773
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4778
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4783
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4792
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+# help of 'no-backup' option of 'revert' command
+#: bzrlib/builtins.py:4806
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+# help of 'forget-merges' option of 'revert' command
+#: bzrlib/builtins.py:4808
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4839
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+# help of 'long' option of 'help' command
+#: bzrlib/builtins.py:4844
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4875
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4887
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4890
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4892
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4894
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4896
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4899
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4901
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4904
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+# help of 'reverse' option of 'missing' command
+#: bzrlib/builtins.py:4911
+msgid "Reverse the order of revisions."
+msgstr ""
+
+# help of 'mine-only' option of 'missing' command
+#: bzrlib/builtins.py:4913
+msgid "Display changes in the local branch only."
+msgstr ""
+
+# help of 'this' option of 'missing' command
+#: bzrlib/builtins.py:4914
+msgid "Same as --mine-only."
+msgstr ""
+
+# help of 'theirs-only' option of 'missing' command
+#: bzrlib/builtins.py:4916
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+# help of 'other' option of 'missing' command
+#: bzrlib/builtins.py:4917
+msgid "Same as --theirs-only."
+msgstr ""
+
+# help of 'revision' option of 'missing' command
+#: bzrlib/builtins.py:4922
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+# help of 'my-revision' option of 'missing' command
+#: bzrlib/builtins.py:4926
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+# help of 'include-merged' option of 'missing' command
+#: bzrlib/builtins.py:4929
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4983
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4987
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5020
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5040
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5055
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5058
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5063
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5074
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5076
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5080
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5086
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+# help of 'clean-obsolete-packs' option of 'pack' command
+#: bzrlib/builtins.py:5095
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5109
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5111
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5114
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5116
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5138
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+# help of 'long' option of 'testament' command
+#: bzrlib/builtins.py:5141
+msgid "Produce long-format testament."
+msgstr ""
+
+# help of 'strict' option of 'testament' command
+#: bzrlib/builtins.py:5143
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5169
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5171
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5174
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+# help of 'all' option of 'annotate' command
+#: bzrlib/builtins.py:5182
+msgid "Show annotations on all lines."
+msgstr ""
+
+# help of 'long' option of 'annotate' command
+#: bzrlib/builtins.py:5183
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5270
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5286
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5289
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5292
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5313
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5316
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5322
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5329
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5331
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5342
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5346
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5348
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5352
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5356
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+# help of 'dry-run' option of 'uncommit' command
+#: bzrlib/builtins.py:5367
+msgid "Don't actually make changes."
+msgstr ""
+
+# help of 'force' option of 'uncommit' command
+#: bzrlib/builtins.py:5368
+msgid "Say yes to all questions."
+msgstr ""
+
+# help of 'keep-tags' option of 'uncommit' command
+#: bzrlib/builtins.py:5370
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+# help of 'local' option of 'uncommit' command
+#: bzrlib/builtins.py:5372
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5421
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5436
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5439
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5443
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5446
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5453
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5458
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5460
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5463
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5469
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+# help of 'config' option of 'break-lock' command
+#: bzrlib/builtins.py:5478
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+# help of 'force' option of 'break-lock' command
+#: bzrlib/builtins.py:5480
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+# help of 'protocol=bzr' option of 'serve' command
+#: bzrlib/builtins.py:5515
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5516
+msgid "Run the bzr server."
+msgstr ""
+
+# help of 'inet' option of 'serve' command
+#: bzrlib/builtins.py:5522
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+# title of 'protocol' option of 'serve' command
+#: bzrlib/builtins.py:5523
+msgid "protocol"
+msgstr ""
+
+# help of 'protocol' option of 'serve' command
+#: bzrlib/builtins.py:5524
+msgid "Protocol to serve."
+msgstr ""
+
+# help of 'listen' option of 'serve' command
+#: bzrlib/builtins.py:5528
+msgid "Listen for connections on nominated address."
+msgstr ""
+
+# help of 'port' option of 'serve' command
+#: bzrlib/builtins.py:5530
+msgid ""
+"Listen for connections on nominated port.  Passing 0 as the port number will "
+"result in a dynamically allocated port.  The default port depends on the "
+"protocol."
+msgstr ""
+
+# help of 'directory' option of 'serve' command
+#: bzrlib/builtins.py:5535
+msgid "Serve contents of this directory."
+msgstr ""
+
+# help of 'allow-writes' option of 'serve' command
+#: bzrlib/builtins.py:5537
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+# help of 'client-timeout' option of 'serve' command
+#: bzrlib/builtins.py:5546
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5564
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5566
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5568
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5590
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5610
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5612
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5616
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5696
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5705 bzrlib/send.py:109
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5710
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5740
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5742
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5746
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5753
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5757
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5763
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5769
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5783
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5787
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
+"\" (MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5794
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5799
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5805
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5808
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+# help of 'output' option of 'send' command
+#: bzrlib/builtins.py:5832
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+# help of 'strict' option of 'send' command
+#: bzrlib/builtins.py:5836
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+# help of 'mail-to' option of 'send' command
+#: bzrlib/builtins.py:5838
+msgid "Mail the request to this address."
+msgstr ""
+
+# help of 'body' option of 'send' command
+#: bzrlib/builtins.py:5842
+msgid "Body for the email."
+msgstr ""
+
+# help of 'no-bundle' option of 'send' command
+#: bzrlib/builtins.py:5895
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+# help of 'no-patch' option of 'send' command
+#: bzrlib/builtins.py:5896
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+# help of 'remember' option of 'send' command
+#: bzrlib/builtins.py:5899
+msgid "Remember submit and public branch."
+msgstr ""
+
+# help of 'from' option of 'send' command
+#: bzrlib/builtins.py:5901
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+# title of 'format' option of 'send' command
+# title of 'format' option of 'version-info' command
+#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+# help of 'format' option of 'send' command
+#: bzrlib/builtins.py:5912
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5934
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5936
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5946
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5949
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+# help of 'delete' option of 'tag' command
+#: bzrlib/builtins.py:5959
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+# help of 'directory' option of 'tag' command
+#: bzrlib/builtins.py:5962
+msgid "Branch in which to place the tag."
+msgstr ""
+
+# help of 'force' option of 'tag' command
+#: bzrlib/builtins.py:5964
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5979
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5981
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5995
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:6003
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:6007
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:6009
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:6013
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:6015
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+# help of 'directory' option of 'tags' command
+#: bzrlib/builtins.py:6021
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+# help of 'sort' option of 'tags' command
+#: bzrlib/builtins.py:6023
+msgid "Sort tags by different criteria."
+msgstr ""
+
+# title of 'sort' option of 'tags' command
+#: bzrlib/builtins.py:6023
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+# title of 'tree_type' option of 'reconfigure' command
+#: bzrlib/builtins.py:6110
+msgid "Tree type"
+msgstr ""
+
+# help of 'tree_type' option of 'reconfigure' command
+#: bzrlib/builtins.py:6111
+msgid "The relation between branch and tree."
+msgstr ""
+
+# help of 'tree_type=branch' option of 'reconfigure' command
+#: bzrlib/builtins.py:6113
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+# help of 'tree_type=tree' option of 'reconfigure' command
+#: bzrlib/builtins.py:6114
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+# help of 'tree_type=checkout' option of 'reconfigure' command
+#: bzrlib/builtins.py:6115
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
+#: bzrlib/builtins.py:6116
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+# title of 'repository_type' option of 'reconfigure' command
+#: bzrlib/builtins.py:6121
+msgid "Repository type"
+msgstr ""
+
+# help of 'repository_type' option of 'reconfigure' command
+#: bzrlib/builtins.py:6122
+msgid "Location fo the repository."
+msgstr ""
+
+# help of 'repository_type=standalone' option of 'reconfigure' command
+#: bzrlib/builtins.py:6124
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+# help of 'repository_type=use-shared' option of 'reconfigure' command
+#: bzrlib/builtins.py:6126
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+# title of 'repository_trees' option of 'reconfigure' command
+#: bzrlib/builtins.py:6130
+msgid "Trees in Repository"
+msgstr ""
+
+# help of 'repository_trees' option of 'reconfigure' command
+#: bzrlib/builtins.py:6131
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+# help of 'repository_trees=with-trees' option of 'reconfigure' command
+#: bzrlib/builtins.py:6133
+msgid "Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
+#: bzrlib/builtins.py:6135
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+# help of 'bind-to' option of 'reconfigure' command
+#: bzrlib/builtins.py:6138
+msgid "Branch to bind checkout to."
+msgstr ""
+
+# help of 'force' option of 'reconfigure' command
+#: bzrlib/builtins.py:6140
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+# help of 'stacked-on' option of 'reconfigure' command
+#: bzrlib/builtins.py:6143
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+# help of 'unstacked' option of 'reconfigure' command
+#: bzrlib/builtins.py:6147
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6157
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6171
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6206
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6208
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6213
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6216
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6218
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6223
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+# help of 'force' option of 'switch' command
+#: bzrlib/builtins.py:6231
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+# help of 'create-branch' option of 'switch' command
+#: bzrlib/builtins.py:6234
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6248
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6261
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6295
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6305
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6322
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6324
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6326
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6328
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6332
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6334
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6336
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6338
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6340
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6342
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6344
+msgid "    bzr view --delete --all"
+msgstr ""
+
+# help of 'all' option of 'view' command
+#: bzrlib/builtins.py:6351
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+# help of 'delete' option of 'view' command
+#: bzrlib/builtins.py:6354
+msgid "Delete the view."
+msgstr ""
+
+# help of 'name' option of 'view' command
+#: bzrlib/builtins.py:6357
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+# help of 'switch' option of 'view' command
+#: bzrlib/builtins.py:6361
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6380
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6383
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6388
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6391
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6398
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6401
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6403
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6419
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6426
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6434
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6457
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6463
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6468
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+# help of 'force' option of 'remove-branch' command
+#: bzrlib/builtins.py:6477
+msgid "Remove branch even if it is the active branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid "Branch is active. Use --force to remove it."
+msgstr ""
+
+# help of 'writer=plain' option of 'shelve' command
+#: bzrlib/builtins.py:6495
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6496
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6498
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6504
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6506
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6514
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6516
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6519
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6523
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6525
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+# help of 'all' option of 'shelve' command
+#: bzrlib/builtins.py:6537
+msgid "Shelve all changes."
+msgstr ""
+
+# help of 'writer' option of 'shelve' command
+#: bzrlib/builtins.py:6539
+msgid "Method to use for writing diffs."
+msgstr ""
+
+# title of 'writer' option of 'shelve' command
+#: bzrlib/builtins.py:6539
+msgid "writer"
+msgstr ""
+
+# help of 'list' option of 'shelve' command
+#: bzrlib/builtins.py:6543
+msgid "List shelved changes."
+msgstr ""
+
+# help of 'destroy' option of 'shelve' command
+#: bzrlib/builtins.py:6545
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6574
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6585
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6587
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+# help of 'action' option of 'unshelve' command
+#: bzrlib/builtins.py:6596
+msgid "The action to perform."
+msgstr ""
+
+# title of 'action' option of 'resolve' command
+# title of 'action' option of 'unshelve' command
+#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+# help of 'action=apply' option of 'unshelve' command
+#: bzrlib/builtins.py:6598
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+# help of 'action=dry-run' option of 'unshelve' command
+#: bzrlib/builtins.py:6599
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+# help of 'action=preview' option of 'unshelve' command
+#: bzrlib/builtins.py:6600
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+# help of 'action=delete-only' option of 'unshelve' command
+#: bzrlib/builtins.py:6602
+msgid "Delete changes without applying them."
+msgstr ""
+
+# help of 'action=keep' option of 'unshelve' command
+#: bzrlib/builtins.py:6603
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6618
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6620
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6623
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6627
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6630
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+# help of 'ignored' option of 'clean-tree' command
+#: bzrlib/builtins.py:6633
+msgid "Delete all ignored files."
+msgstr ""
+
+# help of 'detritus' option of 'clean-tree' command
+#: bzrlib/builtins.py:6634
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+# help of 'unknown' option of 'clean-tree' command
+#: bzrlib/builtins.py:6637
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+# help of 'dry-run' option of 'clean-tree' command
+#: bzrlib/builtins.py:6638
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+# help of 'force' option of 'clean-tree' command
+#: bzrlib/builtins.py:6640
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:487
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:510
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1639
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1659
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1805
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2026
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+# help of 'format=custom' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+# help of 'format=python' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+# help of 'format=rio' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
+#: en/help_topics/configuration.txt:722
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+# help of 'format' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+# help of 'all' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+# help of 'check-clean' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+# help of 'include-history' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+# help of 'include-file-revisions' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+# help of 'template' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:826 bzrlib/gpg.py:347
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:851 bzrlib/commands.py:859
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:868
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:875
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:972
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:976
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:998
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1001
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:34
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:39
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+# help of 'dry-run' option of 'sign-my-commits' command
+#: bzrlib/commit_signature_commands.py:47
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:98
+#, python-format
+msgid "Signed %d revision.\n"
+msgid_plural "Signed %d revisions.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+# help of 'acceptable-keys' option of 'verify-signatures' command
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:148
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:166
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:436
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2452
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2971
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3116
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:4018
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:4020
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:4022
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:4026
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:4028
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+# help of 'scope' option of 'config' command
+#: bzrlib/config.py:4040
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+# help of 'all' option of 'config' command
+#: bzrlib/config.py:4044
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+# help of 'remove' option of 'config' command
+#: bzrlib/config.py:4046
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+# help of 'text' option of 'conflicts' command
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+# help of 'action=done' option of 'resolve' command
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+# help of 'action=take-this' option of 'resolve' command
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+# help of 'action=take-other' option of 'resolve' command
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+# help of 'action' option of 'resolve' command
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+# help of 'all' option of 'resolve' command
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:712
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Invalid branch name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:724
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:730
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:735
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:745
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:755
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:762
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:777
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:787
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:802
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:818
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:828
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:849
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:870
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:881
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:900
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:908
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:919
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:937
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:976
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:986
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1013
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1021
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1032
+msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1043
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1055
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1068
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1097
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1102
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"Excluding paths during commit is not supported by repository at %(repository)"
+"r."
+msgstr ""
+
+#: bzrlib/errors.py:1121
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1127
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1132
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1155
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1160
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1179
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
+"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1193
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1204
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1224
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1230
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1263
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1281
+msgid ""
+"Bound branch %(branch)s is out of date with master branch %(master)s."
+"%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1293
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1314
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1335
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1346
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1365
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1387
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1399
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1404
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1414
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1424
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1559
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1585
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1593
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1625
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1630
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1635
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1656
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1661
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1666
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1676
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1691
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1699
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1713
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1730
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1749
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1762
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1772
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1791
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1799
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1807
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1815
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1823
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1833
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1839
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1867
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1898
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1908
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1921
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1931
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1936
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1946
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1978
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1983
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1988
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1999
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2035
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2065
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2073
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2087
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2099
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2107
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2115
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2123
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2129
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2134
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2145
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2155
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2166
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2176
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2190
+msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2208
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2212
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2223
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2234
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2247
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2268
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2273
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2279
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2284
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2305
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2313
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2327
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2357
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2362
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2367
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2372
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2382
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2392
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2405
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2427
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2434
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2444
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2495
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2502
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2512
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2518
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2528
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2540
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2548
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2558
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2577
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2594
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2602
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
+"\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2612
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2622
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2632
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2640
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2648
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2687
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2706
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2714
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2719
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2727
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2735
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2743
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2756
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2764
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2772
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2777
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2782
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2792
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2801
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2815
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2827
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2832
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2837
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2842
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2847
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2852
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2857
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2863
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2869
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2874
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2879
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
+"%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2898
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
+"%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2904
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2912
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2917
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2932
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
+"\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2966
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2978
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2986
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2994
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3008
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3016
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3024
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3034
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3045
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3053
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3058
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3070
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3078
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3086
+msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3094
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3099
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3109
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3119
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3128
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3195
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3201
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3210
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3218
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3229
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3238
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3247
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3257
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3267
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3279
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3292
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3300
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3309
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3318
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3328
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3339
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+# help of 'no-rebase' option of 'dpush' command
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:366
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:439
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:445
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:453
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:461
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:469
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:489
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:505
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:554
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:313
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:316
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:563
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:565
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:653
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1071 bzrlib/log.py:1129
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1073 bzrlib/log.py:1131
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1818
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2114
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1868
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+# help of 'help' option
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+# help of 'quiet' option
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+# help of 'usage' option
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+# help of 'verbose' option
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+# help of 'change' option
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+# help of 'directory' option
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+# help of 'log-format=long' option
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+# help of 'log-format=gnu-changelog' option
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+# help of 'log-format=line' option
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+# help of 'log-format=short' option
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+# help of 'log-format' option
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+# title of 'log-format' option
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+# help of 'merge-type=lca' option
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+# help of 'merge-type=diff3' option
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+# help of 'merge-type=merge3' option
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+# help of 'merge-type' option
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+# help of 'merge-type=weave' option
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+# title of 'merge-type' option
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+# help of 'message' option
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+# help of 'null' option
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+# help of 'overwrite' option
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+# help of 'remember' option
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+# help of 'reprocess' option
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+# help of 'revision' option
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+# help of 'show-ids' option
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+# help of 'timezone' option
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1259
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+# help of 'plugin' option of 'bash-completion' command
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+# help of 'function-name' option of 'bash-completion' command
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+# help of 'function-only' option of 'bash-completion' command
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:44
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:46
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:50
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:53
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:62
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+# help of 'project' option of 'register-branch' command
+#: bzrlib/plugins/launchpad/cmds.py:69
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+# help of 'branch-name' option of 'register-branch' command
+#: bzrlib/plugins/launchpad/cmds.py:76
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+# help of 'branch-title' option of 'register-branch' command
+#: bzrlib/plugins/launchpad/cmds.py:80
+msgid "One-sentence description of the branch."
+msgstr ""
+
+# help of 'branch-description' option of 'register-branch' command
+#: bzrlib/plugins/launchpad/cmds.py:83
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+# help of 'author' option of 'register-branch' command
+#: bzrlib/plugins/launchpad/cmds.py:86
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+# help of 'link-bug' option of 'register-branch' command
+#: bzrlib/plugins/launchpad/cmds.py:89
+msgid "The bug this branch fixes."
+msgstr ""
+
+# help of 'dry-run' option of 'register-branch' command
+#: bzrlib/plugins/launchpad/cmds.py:92
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:114
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:122
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:152
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+# help of 'dry-run' option of 'launchpad-open' command
+#: bzrlib/plugins/launchpad/cmds.py:157
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:192
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:200
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:202
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:206
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:209
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:211
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:213
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+# help of 'no-check' option of 'launchpad-login' command
+#: bzrlib/plugins/launchpad/cmds.py:220
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:238
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:249
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:255
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:272
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:274
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:277
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:281
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:286
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:288
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+# help of 'staging' option of 'lp-propose-merge' command
+#: bzrlib/plugins/launchpad/cmds.py:293
+msgid "Propose the merge on staging."
+msgstr ""
+
+# help of 'message' option of 'lp-propose-merge' command
+#: bzrlib/plugins/launchpad/cmds.py:295
+msgid "Commit message."
+msgstr ""
+
+# help of 'approve' option of 'lp-propose-merge' command
+#: bzrlib/plugins/launchpad/cmds.py:297
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+# help of 'fixes' option of 'lp-propose-merge' command
+#: bzrlib/plugins/launchpad/cmds.py:298
+msgid "The bug this proposal fixes."
+msgstr ""
+
+# help of 'review' option of 'lp-propose-merge' command
+#: bzrlib/plugins/launchpad/cmds.py:300
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:335
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:337
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:342
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:345
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:347
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:363
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:364
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:374
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:381
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:386
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:392
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/cmds.py:395
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:150
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:237
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:240
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:250
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:279
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:285
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:287
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:289
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:325
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:329
+#: bzrlib/plugins/weave_fmt/bzrdir.py:331
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:348
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:362
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:367
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:507
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:517
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:557
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:565
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:570
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:580
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:590
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:613
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:620
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:641
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:652
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:148
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:152
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:158
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2534
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1738
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1745
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1750
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1754
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1756
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:59
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:63
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:78
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:81
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:99
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:115
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:128
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:140
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:186
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:129
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:167
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:173
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2598
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3017
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:647
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1091
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1117
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1707
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2536
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2542
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
+#: bzrlib/vf_repository.py:3127
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1482
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.6b2 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help checkout"
+"\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
+"\\bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with \".txt"
+"\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid "provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
+"net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
+"HUDSON-1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Set files in the working tree back to the contents of a\n"
+"                  previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid "* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form \"<option_name>:policy"
+"\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"Another such option is ``branchname``, which refers to the name of a "
+"colocated\n"
+"branch.  For non-colocated branches, it behaves like basename.  It can be "
+"used\n"
+"like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{branchname}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:343
+msgid ""
+"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
+"get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:345
+msgid ""
+"  bzr config mypush\n"
+"  lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:348
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:352
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:361
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:363
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:368
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:378
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:381
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:384
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:387
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:391
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:394
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:397
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:401
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:404
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:412
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:414
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:417
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:420
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:422
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:430
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:433
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:440
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:443
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:446
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:449
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:454
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:457
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:460
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:464
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:467
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:470
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:474
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:477
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:481
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:484
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:488
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:491
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:494
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:501
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:504
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:507
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:521
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:523
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:526
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:529
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:532
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:537
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:540
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:545
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:548
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:553
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:555
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:564
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:571
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:574
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:578
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:581
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:588
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:599
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:603
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:606
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:609
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:613
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:616
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:624
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:629
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:632
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:639
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:642
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:652
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:655
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:658
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:661
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:677
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You "
+"may \n"
+"specify this value as an integer (in which case it is interpreted as "
+"bytes), \n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:692
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:695
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:698
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:705
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:714
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:716
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:719
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:724
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid "    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
+"``white`` \n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/env-variables.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: en/help_topics/env-variables.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ "
+"----------------------\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ "
+"----------------------\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
+#: en/help_topics/hooks.txt:307
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:161
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:164
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:166
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:170
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
+#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:182
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:187
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:191
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:196
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:201
+msgid ""
+"post_command\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
+msgid "Introduced in: 2.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:206
+msgid "Called after executing a command. Called with the command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:208
+msgid ""
+"pre_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:213
+msgid "Called prior to executing a command. Called with the command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
+#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
+#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
+#: en/help_topics/hooks.txt:446
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:226
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:231
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:233
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:241
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:246
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:248
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:259
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:270
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
+#: en/help_topics/hooks.txt:524
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:283
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:290
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:295
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:297
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:302
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:304
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:309
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:317
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:319
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:326
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
+#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
+#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:334
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:348
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:350
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:360
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:362
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:370
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:375
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:384
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:389
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:395
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:397
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:402
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:410
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:418
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:423
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:434
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:436
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:443
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:448
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:453
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:458
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:464
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:472
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:477
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:489
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:495
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:500
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:509
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:514
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:521
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:526
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid "For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
+"\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
+"\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/ca.po b/po/ca.po
new file mode 100644
index 0000000..6ef91db
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,13237 @@
+# Catalan translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:18+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/cs.po b/po/cs.po
new file mode 100644
index 0000000..e1c2bd8
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,13261 @@
+# Czech translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-03-01 20:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech <cs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2012-03-02 05:19+0000\n"
+"X-Generator: Launchpad (build 14886)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr "přeskakování {0} (větší než {1} z {2} bajtů)"
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr "Odstraňování ze zásobníku"
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr "Odesláno až na revizi %d"
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] "%d značka aktualizována"
+msgstr[1] "%d značky aktualizovány"
+msgstr[2] "%d značek aktualizováno"
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr "Žádné nové revize nebo značky k odeslání."
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr "Žádné nové revize k odeslání."
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr "zkontrolována větev {0} formát {1}"
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "nalezena chyba:%s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr "Ignorování souborů mimo zobrazení. Zobrazení je %s"
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr "bzr %s --revision přijímá právě jeden identifikátor revize"
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr "Zobrazit souhrn stavů."
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"Toto zaznamenává neznámé soubory a soubory s verzí, nahlašuje je\n"
+"seřazené podle stavu. Možné stavy jsou:"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+"přidáno\n"
+"    S verzí v pracovní kopii ale ne v předchozí revizi."
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+"odstraněno\n"
+"    S verzí v předchozí revizi ale odstraněno nebo smazáno\n"
+"    v pracovní kopii."
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+"přejmenováno\n"
+"    Cesta tohoto souboru byla od předchozí revize změněna;\n"
+"    text se také mohl změnit. To zahrnuje soubory, jejichž\n"
+"    nadřazená složka byla přejmenována."
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+"změněno\n"
+"    Text se od předchozí revize změnil."
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+"druh se změnil\n"
+"    Druh souboru byl změněn (např. ze souboru na složku)."
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+"neznámé\n"
+"    Bez verze a neshoduje se se vzorcem ignorování."
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+"Dále Bazaar označuje typ pro adresáře, symbolické odkazy a\n"
+"soubory se změněným bitem spuštění pomocí koncového\n"
+"znaku: '/', '@' nebo '*' v tomto pořadí. Tato označení mohou\n"
+"být zakázána pomocí možnosti '--no-classify'."
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+"Pro zobrazení ignorovaných souborů použijte 'bzr ignored'. Pro podrobnosti\n"
+"o změnách provedených v textových souborech použijte 'bzr diff'."
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..b387b0a
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,13459 @@
+# German translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-05-05 14:13+0000\n"
+"Last-Translator: Daniel Winzen <d@winzen4.de>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-05-06 04:58+0000\n"
+"X-Generator: Launchpad (build 15195)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr "Überspringe {0} (Größer als {1} von {2} Bytes)"
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr "In Revision %d hochgeladen."
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] "%d Schlüsselwort aktualisiert."
+msgstr[1] "%d Schlüsselwörter aktualisiert."
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr "Keine neuen Revisionen oder Schlüsselwörter zum Hochladen."
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr "Keine neuen Revisionen zum Hochladen."
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr "überprüfter Zweig {0} Format {1}"
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "Fehler gefunden: %s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr "Ignoriere Dateien außerhalb der Ansicht. Die Ansicht ist %s"
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr "bzr %s --revision benötigt genau eine Revisions-Nummer"
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr "Zeige Status-Zusammenfassung an."
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"Dies zeigt versionierte und unbekannte Dateien an –\n"
+"nach Zuständen gruppiert. Mögliche Zustände:"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+"hinzugefügt\n"
+"    In der Arbeitskopie versioniert, jedoch nicht in der vorherigen Revision."
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+"entfernt\n"
+"    In der vorherigen Revision versioniert, jedoch entfernt oder aus der\n"
+"    Arbeitskopie gelöscht."
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr "umbenannt"
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr "verändert"
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+"Dateiart wurde geändert\n"
+"    Dateiart hat sich geändert (z.B. von Datei zu Verzeichnis)"
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+"unbekannt\n"
+"    Nicht versioniert und stimmt nicht mit einem Ignorierungsmuster überein."
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+"Für Verzeichnisse, Symbolische Verweise sowie Dateien\n"
+"mit veränderter Ausführungsberechtigung zeigt Bazaar\n"
+"den Typ zusätzlich durch ein angehängtes Zeichen\n"
+"»/«, »@« oder »*« an. Diese Kennzeichnung kann mit der Option\n"
+"»--no-classify« unterbunden werden."
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+"Mit »bzr ignored« werden ignorierte Dateien aufgelistet.\n"
+"Änderungen an den Dateiinhalten werden mit »bzr diff« angezeigt."
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+"Beachten Sie, dass --short oder -S für jedes Element eine\n"
+"Statusmarkierung anzeigt, ähnlich des Statusbefehls von\n"
+"Subversion. Um eine mit svn -q vergleichbare Ausgabe zu\n"
+"erhalten, verwenden Sie bzr status -SV."
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+"Wenn keine Argumente angegeben wurden, wird der Status des\n"
+"gesamten Arbeitsverzeichnisses angezeigt, andernfalls nur der\n"
+"Status der angegebenen Dateien und Verzeichnisse. Wenn ein\n"
+"Verzeichnis angegeben wurde, wird der Status aller darin\n"
+"enthaltenen Elemente aufgelistet."
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+"Bevor Änderungen übertragen werden, wird für jede ausstehende\n"
+"Zusammenführung die neueste Revision angezeigt. Mit der Option\n"
+"-v werden alle ausstehenden Revisionen angezeigt. Um die\n"
+"Informationen über ausstehende Zusammenführungen komplett\n"
+"zu unterdrücken kann die Option no-pending verwendet oder\n"
+"eine Datei oder ein Verzeichnis angegeben werden."
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+"Um das Arbeitsverzeichnis mit einer bestimmten Revision zu vergleichen,\n"
+"geben Sie eine einzelne Revision mit dem Argument \"revision\" an."
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+"Um zu sehen, welche Dateien in einer bestimmten Revision\n"
+"oder zwischen zwei Revisionen verändert wurden,\n"
+"geben Sie einen Revisionebereich mit dem Argument \"revision\" an.\n"
+"Dies erzeugt das gleiche Ergebnis wie der Aufruf 'bzr diff --summarize'."
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr "Kurze Zustandsanzeiger verwenden."
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr "Nur versionierte Dateien anzeigen."
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr "Ausstehende Zusammenführungen nicht anzeigen."
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr "Objekte nicht entsprechend ihres Typs kennzeichnen."
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+"bzr status --revision benötigt exakt eine oder zwei "
+"Revisionsspezifikation(en)."
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr "Sie können nur revision_id oder --revision angeben"
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr "Sie müssen entweder --revision oder eine revision_id angeben"
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr "Quelle %r unterstützt keinen Zugriff auf reine Revisionstexte"
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr "Die Quelle {0} enthält keine neue Überarbeitung {1}."
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr "Sie können keine NULL-Revision angeben."
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr "Entfernt den Arbeitsbaum zu einer Branch/einem Checkout."
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr "Benutzen Sie »bzr checkout«, um den Arbeitsbaum neu aufzubauen."
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+"Den Arbeitsbaum entfernen, auch wenn dieser nicht übertragene oder "
+"zurückgestellte Änderungen enthält."
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr "Keinen Arbeitsbaum zum Entfernen"
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr "Sie können einen entfernten Arbeitsbaum nicht löschen"
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+"Der Baum scheint nicht beschädigt zu sein. Wahrscheinlich möchten Sie "
+"stattdessen \"bzr revert\" ausführen. Benutzen Sie \"--force\", wenn Sie den "
+"Arbeitsbaum wirklich zurücksetzen möchten."
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+", die Kopfzeilen scheinen beschädigt zu sein. Versuchen Sie -r -1 um den "
+"Status der letzten Einreichung zu übernehmen."
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr "Baumstatus{0} konnte nicht zurückgesetzt werden"
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr "Aktuelle Revisionsnummer anzeigen."
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr "Angegebene Dateien oder Verzeichnisse hinzufügen."
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+"--dry-run zeigt die Dateien an, die hinzugefügt würden,\n"
+"ohne diese wirklich hinzuzufügen."
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+"Alle Dateien, die auf Muster in der Ignorierliste zutreffen, werden\n"
+"nicht hinzugefügt, außer Sie geben diese explizit an."
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr "Inhalte von Verzeichnissen nicht rekursiv hinzufügen."
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr "ignoriert {0} übereinstimmend \"{1}\"\n"
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr "Ein neues versioniertes Verzeichnis erstellen."
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr "Dies entspricht dem Anlegen und Hinzufügen des Ordners."
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr "%s hinzugefügt\n"
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr "Eine Datei verschieben oder umbenennen."
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr "    bzr mv QUELLE... ZIEL"
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr "Dateien können nicht zwischen Zweigen verschoben werden."
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+"Verschiebe nur den bzr-Bezeichner der Datei, da diese bereits verschoben "
+"wurde."
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr "Umbenennungen automatisch erraten"
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr "Keine Änderungen durchführen, wenn Umbenennungen erraten werden."
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr "--dry-run erfordert --auto."
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr "Datei-Argument fehlt"
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr "Wurzel des Zweiges kann nicht verschoben werden"
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr "Es kann nur ein Pfad mit --auto angegeben werden."
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr "--after kann nicht mit --auto angegeben werden."
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+"um mehrere Dateien zu verschieben, muss das Ziel ein versioniertes "
+"Verzeichnis sein"
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr "Diesen Zweig zu einer Spiegelung eines anderen Zweiges machen."
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr "Ein Arbeitsbaum wird für --show-base benötigt."
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr "Eine Spiegelung dieses Zweiges aktualisieren."
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+"Einige intelligente Server oder Protokolle legen den Arbeitsbaum\n"
+"*möglicherweise* in die Zukunft."
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+"Einen gestapelten Zweig anlegen, der auf den öffentlichen Pfad des "
+"übergeordneten Zweigs referenziert."
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr "Zu Zweig gewechselt: %s"
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr "Die verfügbaren Zweige an der aktuellen Stelle auflisten."
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+"Dieser Befehl wird die Namen aller verfügbaren Zweige\n"
+"an der aktuellen Stelle auflisten."
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr "(Vorgabe)"
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+"Liste der umbenannten Dateien zeigen.\n"
+"    "
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ":Beispiele:"
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr "    bzr info -v"
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr "    bzr info -vv"
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr "Dateien oder Verzeichnisse entfernen."
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr "Der Datei-Löschmodus, der verwendet wird."
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr "Lösch-Strategie"
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr "Geänderte Dateien sichern (Vorgabe)."
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr "Geänderte Dateien nicht sichern."
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr "Keine zutreffenden Dateien."
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr "Ein Verzeichnis zu einem versionierten Entwicklungszweig machen."
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr "Geben Sie ein Format für diesen Zweig an. Siehe »help formats«."
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr "Ein {0} wurde erstellt (Format: {1})\n"
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (Hier Dateien hinzufügen)"
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+":Rückgabewerte:\n"
+"    1 - Geändert\n"
+"    2 - Nicht darstellbare Änderungen\n"
+"    3 - Fehler\n"
+"    0 - Keine Änderungen"
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr "        bzr diff"
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr "        bzr diff -r1"
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr "        bzr diff -r1..3"
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr "        bzr diff -r1..3 xxx"
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr "        bzr diff -c2"
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr "        bzr diff -r-2.."
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr "        bzr diff --old xxx"
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr "Diese Optionen an das externe Programm diff übergeben."
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr "Diesen Befehl zum Vergleichen von Dateien benutzen."
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr "Diff-Format, das benutzt werden soll."
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr "Diff-Format"
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr "{0} und {1} schließen sich gegenseitig aus"
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ":Ausgabesteuerung:"
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ":Sortierungssteuerung:"
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ":Revision-Filtern:"
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ":Pfad-Filtern:"
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr "  In diesem Fall:"
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ":Anderes Filtern:"
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ":Tipps & Tricks:"
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr "Autoren"
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr "Unbekannte Dateien ausgeben."
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr "Versionierte Dateien ausgeben."
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr "Ignorierte Dateien ausgeben."
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr "        bzr ignore \"RE:^#\""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr "        bzr ignore \"lib/**/*.o\""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr "        bzr ignore \"RE:lib/.*\\.o\""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] "Ungültiges Ignorierungsmuster gefunden. %s"
+msgstr[1] "Ungültige Ignorierungsmuster gefunden. %s"
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr "Alternativ, um nur die Dateien aufzulisten:"
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr "    bzr ls --ignored"
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr "Keine gültige Revisionsnummer: %r"
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr "Art der Datei, in die exportiert wird."
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr "Nicht unterstütztes Export-Format: %s"
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+"Wenn keine Revision bestimmt wurde, wird die neueste Revision benutzt."
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr "{0!r} ist in Revision {1} nicht vorhanden"
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ":Benutzerdefinierte Autoren:"
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ":Prüfungen:"
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ":Dinge, die zu beachten sind:"
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr "Beschreibung der neuen Revision."
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr "Bitte geben Sie entweder --message oder --file an"
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr "Format des Zweiges"
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr "Nur zeigen, was getan werden würde, aber nichts wirklich machen."
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+":Beispiele:\n"
+"    Die E-Mail-Adresse des aktuellen Benutzers zeigen::"
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr "        bzr whoami --email"
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr "    Aktuellen Benutzer festlegen::"
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr "        bzr whoami \"Frank Chu <ich@beispiel.de>\""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr "Nur die E-Mail-Adresse anzeigen."
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+":Beispiele:\n"
+"    Die aktuellen Aliase zeigen::"
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr "        bzr alias"
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr "        bzr alias ll"
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr "        bzr alias ll=\"log --line -r-10..-1\""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr "        bzr alias --remove ll"
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr "Den Alias entfernen."
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr "bzr alias --remove erwartet einen Alias zum Entfernen."
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr "Version von bzr anzeigen."
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr "Nur die Versionsnummer ausgeben."
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr "        bzr merge ../bzr.dev"
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr "        bzr merge -r 82 ../bzr.dev"
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr "        bzr merge -r 81..82 ../bzr.dev"
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr "        bzr merge /tmp/merge"
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr "Änderungen interaktiv auswählen."
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr "Nichts zu tun."
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr "        bzr remerge --show-base"
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+"Hilfe zu einem Befehl oder Thema anzeigen.\n"
+"    "
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr "Hilfe zu allen Befehlen anzeigen."
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr "        bzr missing"
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr "        bzr missing -r ..-10"
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr "        bzr missing --my-revision ..-10"
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr "Nur Änderungen im lokalen Zweig anzeigen."
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr "Dasselbe wie --mine-only."
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr "Nur Änderungen im entfernten Zweig anzeigen."
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr "Dasselbe wie --theirs-only."
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] "Sie haben %d zusätzliche Revision:\n"
+msgstr[1] "Sie haben %d zusätzliche Revisionen:\n"
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] "Ihnen fehlt %d Revision:\n"
+msgstr[1] "Ihnen fehlen %d Revisionen:\n"
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr "Dieser Zweig hat keine neuen Revisionen.\n"
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr "Anderer Zweig hat keine neuen Revisionen.\n"
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr "Zweige sind aktuell.\n"
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr "Installierte Erweiterungen auflisten."
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr "Ursprung jeder Zeile in einer Datei anzeigen."
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr "Bitte geben Sie entweder eine Revision oder einen Bereich an."
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr "Keine Änderungen durchführen."
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr "Alle Fragen mit Ja beantworten."
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+"Testlauf, es wird so getan, als ob die obigen Revisionen entfernt würden.\n"
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr "Oben stehende Revision(en) wird/werden entfernt.\n"
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr "Abgebrochen\n"
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr "Das Bazaar-Smart-Server-Protokoll via TCP. (Vorgabe-Port: 4155)"
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr "Den bzr-Server starten."
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr "Protokoll"
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+"* Ein optionaler Patch, der eine Vorschau der gewünschten Änderungen "
+"darstellt"
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr "Die Anfrage an diese Adresse schicken."
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr "Inhalt der E-Mail."
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr "Format"
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr "Das angegebene Ausgabeformat benutzen."
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr "Sortierung"
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr "Es muss eine Zielkonfiguration angegeben werden."
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+"Es kann nicht --stacked-on und --unstacked gleichzeitig benutzt werden"
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr "Keine Zielkonfiguration angegeben"
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr "    bzr view"
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr "    bzr view --delete"
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr "    bzr view --switch off"
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr "    bzr view --all"
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr "    bzr view --delete --all"
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr "Einen Zweig entfernen."
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr "    bzr remove-branch repo/trunk"
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr "Die auszuführende Aktion."
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr "Aktion"
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr "Änderungen anzeigen, aber nicht anwenden oder entfernen."
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr "Änderungen löschen ohne diese anzuwenden."
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr "Änderungen anwenden, aber diese nicht löschen."
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr "Um zu prüfen, was clean-tree tun wird, --dry-run benutzen."
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr "Alle ignorierten Dateien löschen."
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr "Dateien löschen, die bzr nicht bekannt sind (Vorgabe)."
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr "Dateien zum Löschen anzeigen, anstelle diese zu löschen."
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr "Vor dem Löschen nicht nachfragen."
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr "Revisionen installieren"
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr "Revisionen\n"
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr "{0} wurde in {1} umbenannt"
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr "Revisionen prüfen"
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr "%6d Revisionen"
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr "%6d Geister-Revisionen"
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr "Zweig wird geprüft bei »%s«."
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr "Nichts zu löschen."
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr "Sind Sie sicher, dass Sie diese löschen möchten"
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr "Abgebrochen"
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr "%s kann nicht entfernt werden"
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr "Pfade werden gelöscht:"
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr "»{0}« kann nicht entfernt werden: {1}."
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr "Keine Dateien gelöscht."
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+"Unbekanntes Format {0} für Versionsinformationen. Unterstützte Typen sind: "
+"{1}"
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr "Versionsinformationen im Python-Format."
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr "Versionsinformationen im RIO (nur Text)-Format (Vorgabe)."
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr "Zum Beispiel:"
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr "Wählen Sie das Ausgabeformat."
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr "Sämtliche verfügbaren Informationen einschließen."
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr "Revisionsverlauf einschließen."
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr "Neueste Revision jeder Datei einschließen."
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr "Unbekannter Befehl »%s«"
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr "Keine Hilfe zu diesem Befehl verfügbar."
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ":Zweck: %s\n"
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+":Aufruf:\n"
+"%s\n"
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ":Aufruf: %s\n"
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ":Optionen: %s"
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+":Beschreibung:\n"
+"  %s\n"
+"\n"
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ":Aliase:  "
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ":Von:     Erweiterung »%s«\n"
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ":Siehe auch: %s"
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr "Hinzugefügt"
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr "Geändert"
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr "%s gelöscht"
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr "%s fehlt"
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr "Umbenannt"
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr "Ungeändert"
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr "Eine Konfigurationsoption anzeigen, festlegen oder löschen."
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr "Aktiven Wert zur angegebenen Option anzeigen."
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr "Alle definierten Werte für die zutreffenden Optionen anzeigen."
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr "Die Option aus der Konfigurationsdatei entfernen."
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr "In Konflikt stehende Dateien auflisten."
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr "Benutzen Sie bzr resolve, wenn Sie ein Problem gelöst haben."
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr "Verbleibende Konflikte:"
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr "Ungültige Revisionsnummer %(revno)s"
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr "Kein öffentlicher Zweig für »%(branch_url)s« festgelegt."
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr "%(url)s ist kein lokaler Pfad."
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr "Fehler in den Befehlszeilenoptionen"
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr "%(value)s ist kein Index vom Typ %(_type)s."
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr "Fehler in den Daten für Index %(value)s."
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr "Der Schlüssel »%(key)s« ist bereits im Index »%(index)s«."
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr "Der Schlüssel »%(key)s« ist ein ungültiger Schlüssel."
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr "Optionen für Index %(value)s konnten nicht verarbeitet werden."
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr "Der Wert »%(value)s« ist ein ungültiger Wert."
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr "Ungültiger Wert »%(value)s« für die Option »%(name)s«."
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr "Allgemeiner Fehler im Pfad: %(path)r%(extra)s)"
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr "Datei existiert nicht: %(path)r%(extra)s"
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr "Datei existiert: %(path)r%(extra)s"
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr "»%(path)s« ist kein Verzeichnis %(extra)s"
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr "Verzeichnis ist nicht leer: »%(path)s«%(extra)s"
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr "Zugriff verweigert: »%(path)s«%(extra)s"
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr "Fehler beim Lesen von %(path)r."
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr "Kein Zweig: »%(path)s«%(detail)s."
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr "Bereits ein Zweig: »%(path)s«."
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr "Unbekanntes %(kind)s-Format: %(format)r"
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+"Das Format %(format)s ist inkompatibel zu der .bzr-Version %(bzrdir)s."
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr "Die Revision ist inkompatibel zu %(repo_format)s"
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr "%(context_info)s%(path)s ist bereits versioniert."
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr "%(context_info)s%(path)s ist nicht versioniert."
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr "Pfad(e) ist/sind nicht versioniert: %(paths_as_string)s"
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr "Pfad(e) existiert/existieren nicht: %(paths_as_string)s%(extra)s"
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr "Die Option --change akzeptiert keine Revisionsbereiche"
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+"Angeforderte Revision: »%(spec)s« existiert nicht im Zweig: "
+"%(branch_url)s%(extra)s"
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr "Revision {%(revision_id)s} ist bereits in %(weave)s vorhanden"
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr "Revision {%(revision_id)s} ist nicht in %(weave)s vorhanden"
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr "Fehler bei versionierter Datei"
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr "Revision {%(revision_id)s} ist nicht in »%(file_id)s« vorhanden."
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr "Revision {%(revision_id)s} ist bereits in »%(file_id)s« vorhanden."
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr "Der Text entsprach nicht seiner Prüfsumme: %(msg)s"
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr "Exportformat %(format)r wird nicht unterstützt"
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr "Übertragungsfehler: %(msg)s %(orig_error)s"
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr "Allgemeiner bzr-Smart-Protokoll-Fehler: %(details)s"
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr "Verbindungsfehler: %(msg)s %(orig_error)s"
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr "Verbindung geschlossen: %(msg)s %(orig_error)s"
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr "Verbindung abgelaufen: %(msg)s%(orig_error)s"
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr "Ungültige HTTP-Antwort für %(path)s: %(msg)s%(orig_error)s"
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr "Zertifikatsfehler: %(error)s"
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr "Ungültiger HTTP-Bereich %(range)r für %(path)s: %(msg)s"
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr "»HTTP MIME Boundary« für %(path)s fehlt: %(msg)sy"
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr "Ungültiger HTTP-Content-type »%(ctype)s« für %(path)s: %(msg)s"
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr "%(source)s wird%(permanently)s umgeleitet nach %(target)s"
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr "Zu viele Umleitungen"
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr "Konfigurationsdatei %(filename)s ist nicht UTF-8-kodiert\n"
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr "%(username)r scheint keine vernünftige E-Mail-Adresse zu haben"
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr "Importieren der Bibliothek »%(library)s« nicht möglich: %(error)s"
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr "Im Zweig %(base)s fehlt Revision %(text_revision)s von %(file_id)s"
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr "Umbenennen von %(from_path)s in %(to_path)s gescheitert: %(why)s"
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+"Das Format %(format)s kann von dieser Bazaar-Version nicht initialisiert "
+"werden."
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr "%(exe_name)s konnte nicht auf diesem Rechner gefunden werden"
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr "Diff ist auf diesem Rechner nicht installiert: %(msg)s"
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr "Diff3 ist auf diesem Rechner nicht installiert."
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr "Der gerade eingefügte Inhalt ist bereits vorhanden."
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+"Im öffentlichen Zweig »%(public_location)s« fehlt Revision »%(revstring)s«."
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr "Die Datei ist binär, sollte aber Text sein."
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr "Der Pfad %(path)s ist auf dieser Plattform nicht erlaubt"
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr "Geister-Revision {%(revision_id)s} kann hier nicht benutzt werden."
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr "Der Server meldete einen unerwarteten Fehler: %(error_tuple)r"
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr "Fehlerhafter oder inkompatibler Datenstrom: %(reason)s"
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr "SMTP-Fehler: %(error)s"
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr "SMTP-Verbindung zu %(host)s wurde abgelehnt"
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr "»%(display_url)s« ist bereits ein Zweig."
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr "Variable {%(name)s} steht nicht zur Verfügung."
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+"Ungültiges Zeitzonenformat »%(timezone)s«, die Optionen sind »utc«, "
+"»original« und »local«."
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr "Die Konfiguration »%(config_id)s« existiert nicht."
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr "Die Konfigurationsoption »%(option_name)s« existiert nicht."
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr "Der Alias »%(alias_name)s« existiert nicht."
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr "Unbekannte Regeln festgestellt: %(unknowns_str)s."
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr "Der Vorgang wurde vom Benutzer abgebrochen."
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr "Ungültige(s) Muster gefunden. %(msg)s"
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+"Die fehlende Funktion %(feature)s wird weder von dieser Bazaar-Version noch "
+"von irgendeiner Erweiterung unterstützt."
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr "Auf einen Abschnitt für Binärdateien gestoßen."
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+"Ungültige Zeile.  %(desc)s\n"
+"%(line)r"
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr "Revisionen finden"
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr "Revisionen herunterladen"
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr "Eingeführt in: %s"
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr "Veraltet in: %s"
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr "Siehe »bzr help break-lock« für mehr Informationen."
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr "--exclude-common-ancestry erfordert zwei verschiedene Revisionen"
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr "Ungültige Richtung %r"
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr "Unbekannter Protokollformatierer: %r"
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] "behebt den Fehler"
+msgstr[1] "behebt die Fehler"
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr "Alle Änderungen erfolgreich angewendet."
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr "Auf %d Konflikte gestoßen."
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr "Revisionen importieren"
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr "Hilfetext anzeigen."
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr "Nur Fehler und Warnungen anzeigen."
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr "Aufruf und Optionen anzeigen."
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr "Weitere Informationen anzeigen."
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr "Ausführliches Protokollformat."
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr "Format von »GNU ChangeLog«-Dateien."
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr "Protokollformat mit einer Zeile pro Revision."
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr "Relativ kurzes Protokollformat."
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr "Angegebenes Protokollformat benutzen."
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr "Protokollformat"
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr "Nachrichtenzeichenkette."
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr "Den angegebenen Ort als Vorgabe merken."
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr "Erneut ausführen, um scheinbare Konflikte zu verringern."
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr "Siehe »help revisionspec« für Details."
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr "Zeitzone als local, original oder utc anzeigen."
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr "Entschuldigung, %r ist im Pfad nicht erlaubt"
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr "%r ist zu kurz, um einen relativen Pfad zu berechnen"
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr "»%s« ist keine gültige <plugin_name>@<plugin_path>-Beschreibung "
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+"Gebräuchlicher Aufruf wie folgt:\n"
+"    eval \"`bzr bash-completion`\""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr "Name der erzeugten Funktion (Vorgabe: _bzr)"
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr "Einen Zweig bei launchpad.net registrieren."
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+"Beispiel:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr "Launchpad-Projekt-Kurzname, dem der Zweig zugeordnet wird."
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr "Beschreibung des Zweiges in einem Satz."
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr "Längere Beschreibung für den Zweck oder die Inhalte des Zweiges."
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr "E-Mail-Adresse des Autors des Zweigs, wenn Sie es nicht selbst sind."
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr "Der Fehler, den dieser Zweig behebt."
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr "Die Anfrage vorbereiten, aber nicht absenden."
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr "--product ist veraltet; bitte --project benutzen."
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr "Eine Launchpad-Zweig-Seite in Ihrem Web-Browser öffnen."
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr "%s wird im Web-Browser geöffnet"
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr "Den Launchpad-Benutzernamen anzeigen oder festlegen."
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr "      bzr launchpad-login"
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr "      bzr launchpad-login bob"
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr "Den Benutzernamen nicht auf Gültigkeit prüfen."
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr "Launchpad-Benutzername existiert und hat SSH-Schlüssel.\n"
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr "Kein Launchpad-Benutzername konfiguriert.\n"
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr "Launchpad-Benutzername auf »%s« festgelegt.\n"
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr "Launchpad jetzt darum bitten, einen Zweig zu spiegeln."
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr "SSH/SFTP-Benutzernamen für launchpad.net festlegen."
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr "%s ist nicht in Launchpad registriert"
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr "%s ist bereits auf dem neuesten Stand."
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr "Revision umwandeln"
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr "%6d Revisionen nicht vorhanden"
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr "%6d Texte"
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr "Revision schreiben"
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr "Revision laden"
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr "Dateien des Zweigs finden"
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr "%s wird verschoben"
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr "Neuer Zweig wurde erstellt."
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr "Lösche backup.bzr"
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr "Entferne Backup…"
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+"Bazaar 2.5b6 – Ein frei vertriebenes »Verteiltes Versionsverwaltungssystem«\n"
+"http://bazaar.canonical.com/"
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+"Grundbefehle:\n"
+"  bzr init           Aktuelles Verzeichnis wird zu einem versionierten Zweig "
+"gemacht\n"
+"  bzr branch         Eine Kopie eines anderen Entwicklungszweigs wird "
+"erstellt"
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+"  bzr add            Dateien oder Verzeichnisse werden versioniert\n"
+"  bzr ignore         Eine Datei oder ein Dateimuster wird ignoriert\n"
+"  bzr mv             Eine versionierte Datei wird verschoben oder umbenannt"
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+"  init    Ein Verzeichnis wird als ein versionierter Zweig festgelegt\n"
+"  branch  Ein neuer Zweig wird durch Kopieren eines bestehenden Zweigs "
+"erstellt\n"
+"  merge   Ein Dreiwege-Merge wird durchgeführt\n"
+"  bind    Ein Zweig wird mit einem anderen verbunden\n"
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr "Bug Tracker Einstellungen"
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr "Aktuelle Speicherformate"
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr "Eine typische Konfigurationsdatei könnte so aussehen::"
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr "Speicherformate"
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr "Informationen zur Auswahl eines Speicherformats"
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr "Alle versteckten Befehle"
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr "Integration mit Launchpad.net"
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr "Für weitere Informationen siehe http://help.launchpad.net/\n"
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr "  init    Ein Verzeichnis zu einem versionierten Zweig machen.\n"
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr "Standard-Optionen"
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr "Status-Flags"
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr "Themen-Liste"
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr "Unterstützte Transportprotokolle"
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr "Nützliche Befehle::"
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr "  bzr branch ftp://joe:secret@host.com/pfad/zu/meiner/branch"
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr "  bzr branch ftp://host.com/pfad/zu/meiner/branch"
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.de\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr "1. Benutzername und Passwort"
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+"Dateiformat\n"
+"-----------"
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr "* ``port``: der Port auf dem der Server horcht,"
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr "* ``password``: das Passwort."
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+"\n"
+"Beispiele\n"
+"---------"
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr "Bug Tracker Einstellungen"
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr "    bzr commit --fixes <tracker>:<id>"
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr "oder::"
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+"Launchpad\n"
+"---------"
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr "    bugzilla_squid_url = http://bugs.squid-cache.org"
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+"trac_<tracker>_url\n"
+"------------------"
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr "  \"John Doe <jdoe@beispiel.de>\""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+"BZR_HOME\n"
+"~~~~~~~~"
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+"BZR_SSH\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr "Wählen Sie eine andere SSH-Implementierung."
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+"BZR_PDB\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+"* 0 = Standard Verhalten\n"
+"* 1 = Debugger starten"
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+"BZR_LOG\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+"  BZR_PLUGIN_PATH='/Pfad/zu/meiner/Seite/Erweiterungen:-Seite':+Benutzer"
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+"Beispiel:\n"
+"~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+"BZRPATH\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+"  http_proxy=http://proxy.beispiel.de:3128/ \n"
+"  https_proxy=http://proxy.beispiel.de:3128/"
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+"    [http://meinebranchen.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+"    email = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@beispiel.de>"
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr "    debug_flags = hpss"
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr "    debug_flags = hpss,evil"
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr "Unterstützte generische Werte sind:"
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr "Gültige Werte:"
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr "  ``bzr resolve FILE --action=done'"
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr "   ``bzr resolve FILE``"
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr "Es gibt zwei mögliche Werte für diese Option:"
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr "Aktuelle Speicherformate"
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr "Eingeführt in: 1.6"
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr "Eingeführt in: 0.91"
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr "Eingeführt in: 1.9"
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr "Eingeführt in: 1.13"
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr "Eingeführt in: 1.17"
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr "Eingeführt in: 2.4"
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr "Eingeführt in: 1.14"
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr "Eingeführt in: 1.15"
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr "Andere Speicherformate"
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ":revid:"
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ":submit:"
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr "    Beispiele::"
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr "      $ bzr diff -r submit:"
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ":ancestor:"
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ":date:"
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr "    Eine Möglichkeit, alle Änderungen seit gestern anzuzeigen wäre:"
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr "        bzr log -r date:yesterday.."
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ":branch:"
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr "      branch:/pfad/zur/branch"
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ":tag:"
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ":revno:"
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ":before:"
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ":annotate:"
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ":mainline:"
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+"      last:1        -> Gibt die letzte Version zurück\n"
+"      last:3        -> Gibt die Version zwei vor dem Ende zurück\n"
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+"Regeln\n"
+"======"
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+"Dateien\n"
+"-------"
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+"Regel-Muster\n"
+"-------------"
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+"Kommatas haben eine spezielle Bedeutung in URLs und markieren "
+"`Abschnittparameter`_"
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr "Unterstützte URL-Präfixe::"
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr "Unterstützte Modifikatoren::"
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr "  http://bzruser:BadPass@bzr.beispiel.de:8080/bzr/trunk"
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr "  bzr+ssh://remote@shell.beispiel.de/~/meinprojekt/trunk"
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr "Würde verweisen auf »/home/remote/meinprojekt/trunk«."
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
+"Viele Kommandos die URLs akzeptieren, akzeptieren auch Platzaliase.\n"
+"Siehe :doc:`location-alias-help` und :doc:`url-special-chars-help`.\n"
diff --git a/po/en_AU.po b/po/en_AU.po
new file mode 100644
index 0000000..3012495
--- /dev/null
+++ b/po/en_AU.po
@@ -0,0 +1,13396 @@
+# English (Australia) translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Australia) <en_AU@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:22+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr "skipping {0} (larger than {1} of {2} bytes)"
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr "Unstacking"
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr "Pushed up to revision %d."
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr "No new revisions or tags to push."
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr "No new revisions to push."
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "found error:%s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr "Ignoring files outside view. View is %s"
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr "bzr %s --revision takes exactly one revision identifier"
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr "Display status summary."
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+"modified\n"
+"    Text has changed since the previous revision."
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr "Use short status indicators."
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr "Only show versioned files."
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr "Don't show pending merges."
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr "Do not mark object type using indicator."
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr "bzr status --revision takes exactly one or two revision specifiers"
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr "You can only supply one of revision_id or --revision"
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr "You must supply either --revision or a revision_id"
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr "Repository %r does not support access to raw revision texts"
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr "The repository {0} contains no revision {1}."
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr "You cannot specify a NULL revision."
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr "Remove the working tree from a given branch/checkout."
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr "To re-create the working tree, use \"bzr checkout\"."
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr "No working tree to remove"
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr "You cannot remove the working tree of a remote path"
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr "You cannot remove the working tree from a lightweight checkout"
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr "failed to reset the tree state{0}"
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr "Show current revision number."
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr "This is equal to the number of revisions on this branch."
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr "Add specified files or directories."
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr "Don't recursively add the contents of directories."
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr "Lookup file ids from this tree."
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr "ignored {0} matching \"{1}\"\n"
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr "Create a new versioned directory."
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr "This is equivalent to creating the directory and then adding it."
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr "No error if existing, make parent directories as needed."
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr "added %s\n"
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr "invalid kind %r specified"
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr "Move or rename a file."
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr "    bzr mv SOURCE... DESTINATION"
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr "Files cannot be moved between branches."
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr "Automatically guess renames."
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr "Avoid making changes when guessing renames."
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr "--dry-run requires --auto."
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr "missing file argument"
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr "Only one path may be specified to --auto."
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr "--after cannot be specified with --auto."
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr "to mv multiple files the destination must be a versioned directory"
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr "Turn this branch into a mirror of another branch."
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr "Show logs of pulled revisions."
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+"Branch to pull into, rather than the one containing the working directory."
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr "Need working tree for --show-base."
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr "No pull location known or specified."
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr "Using saved parent location: %s\n"
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr "Cannot use -r with merge directives or bundles"
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr "Update a mirror of this branch."
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive and is not supported on remote file systems."
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+"Branch to push from, rather than the one containing the working directory."
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr "(default)"
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr "{0} is not an SI unit."
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr "The feature %(feature)s has already been registered."
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+"post_merge\n"
+"~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr "Introduced in: 2.5"
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+"pre_merge\n"
+"~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+"TransportHooks\n"
+"--------------"
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
+
+#~ msgid ""
+#~ "Bazaar 2.5b5 -- a free distributed version-control tool\n"
+#~ "http://bazaar.canonical.com/"
+#~ msgstr ""
+#~ "Bazaar 2.5b5 -- a free distributed version-control tool\n"
+#~ "http://bazaar.canonical.com/"
diff --git a/po/en_GB.po b/po/en_GB.po
new file mode 100644
index 0000000..2f1a65b
--- /dev/null
+++ b/po/en_GB.po
@@ -0,0 +1,13331 @@
+# English (United Kingdom) translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:21+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr "skipping {0} (larger than {1} of {2} bytes)"
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr "Unstacking"
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr "Pushed up to revision %d."
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] "%d tag updated."
+msgstr[1] "%d tags updated."
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr "No new revisions or tags to push."
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr "No new revisions to push."
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr "checked branch {0} format {1}"
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "found error:%s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr "Ignoring files outside view. View is %s"
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr "bzr %s --revision takes exactly one revision identifier"
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr "Display status summary."
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+"modified\n"
+"    Text has changed since the previous revision."
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+"type changed\n"
+"    File type has been changed (e.g. from file to directory)."
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+"To see ignored files, use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr "Use short status indicators."
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr "Only show versioned files."
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr "Don't show pending merges."
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr "Do not mark object type using indicator."
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr "bzr status --revision takes exactly one or two revision specifiers"
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr "You can only supply one of revision_id or --revision"
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr "You cannot specify a NULL revision."
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr "You cannot remove the working tree of a remote path"
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr "You cannot remove the working tree from a lightweight checkout"
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr "failed to reset the tree state{0}"
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr "Show current revision number."
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr "Show revno of working tree."
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr "Add specified files or directories."
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr "Lookup file ids from this tree."
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr "Create a new versioned directory."
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr "No error if existing, make parent directories as needed."
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr "invalid type %r specified"
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr "Move or rename a file."
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr "    bzr mv SOURCE... DESTINATION"
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr "Files cannot be moved between branches."
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr "Automatically guess renames."
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr "Avoid making changes when guessing renames."
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr "missing file argument"
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr "cannot move root of branch"
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr "List entries of a particular type: file, directory, symlink."
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr "invalid type specified"
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr "Unknown %(kind)s format: %(format)r"
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr "Cannot operate on \"%(filename)s\" of unsupported type \"%(kind)s\""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr "Unsupported entry type %(kind)s"
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+"Type change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File type changed\n"
+"  M File modified"
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+"Bazaar tries to avoid conflicts; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+"Various actions are available depending on the kind of conflict; for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+"To resolve that kind of conflict, you just have to decide which name should "
+"be\n"
+"retained for the file involved."
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide which\n"
+"name should be retained for the directories involved."
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+"To resolve that kind of conflict, you have to decidewhich name should be\n"
+"retained for the file, directory or symlink involved."
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
+
+#~ msgid ""
+#~ "Merge will do its best to combine the changes in two branches, but there\n"
+#~ "are some kinds of problems only a human can fix.  When it encounters those,\n"
+#~ "it will mark a conflict.  A conflict means that you need to fix something,\n"
+#~ "before you should commit."
+#~ msgstr ""
+#~ "Merge will do its best to combine the changes in two branches, but there\n"
+#~ "are some kinds of problems only a human can fix.  When it encounters those,\n"
+#~ "it will mark a conflict.  A conflict means that you need to fix something,\n"
+#~ "before you should commit."
diff --git a/po/es.po b/po/es.po
new file mode 100644
index 0000000..8881c85
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,14081 @@
+# Spanish translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:21+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr "omitiendo {0} (mayor que {1} de {2} bytes)"
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr "Desapilando"
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr "Subido a la revisión %d."
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] "%d etiqueta actualizada"
+msgstr[1] "%d etiquetas actualizadas"
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr "No hay revisiones o etiquetas para subir."
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr "No hay revisiones para subir."
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr "rama comprobada {0} formato {1}"
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "error encontrado: %s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr "Ignorando archivos fuera de la vista. La vista es %s"
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr "bzr %s --revision toma exactamente un identificador de revisión"
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr "Mostrar resumen de estado."
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"Esto informa de archivos versionados y desconocidos, se informa de ellos\n"
+"agrupados por estado. Los estados posibles son:"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+"añadido\n"
+"    Versionado en la copia de trabajo pero no en la revisión anterior."
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+"eliminado\n"
+"    Versionado en la revisión anterior pero borrado o eliminado\n"
+"    en la copia de trabajo."
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+"renombrado\n"
+"    La ruta  de este archivo ha cambiado desde una revisión anterior;\n"
+"    el siguiente se debería cambiar también. Esto incluye archivos cuyo\n"
+"    directorio padre ha sido renombrado."
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+"modificado\n"
+"    El texto ha cambiado desde una revisión previa."
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+"tipo cambiado\n"
+"    El tipo del archivo ha cambiado (p. e. de archivo a directorio)."
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+"desconocido\n"
+"    Ni se ha versionado ni se ha encontrado un patrón ignorado."
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+"Adicionalmente para directorios, vínculos simbólicos y archivos con el bit "
+"de\n"
+"ejecutable cambiado, Bazaar indica su tipo usando un carácter \n"
+"final: «/», «@» o «*» respectivamente. Estas decoraciones pueden ser\n"
+"desactivadas usando la opción «--no-classify»."
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+"Para ver archivos ignorados use «bzr ignored». Para más detalles en los \n"
+"cambios de textos en los archivos, use «bzr diff»."
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+"Note que --short o -S devuelve indicadores de estado para cada elemento, de "
+"forma\n"
+"similar a la orden status de Subversion. Para obtener una salida similar a "
+"svn -q\n"
+" use bzr status -SV."
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+"Si no se indican argumentos, se muestra el estado del directorio de\n"
+"trabajo completo. De otra forma, solo se informa del estado de los\n"
+"archivos o directorios indicados. Si se proporciona un directorio, se\n"
+"informa del estado de todo lo contenido en ese directorio."
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+"Antes de que se confirmen las fusiones, se muestran las sugerencias de\n"
+"fusión de las revisiones. Para ver todas las fusiones pendientes, use la "
+"opción -v.\n"
+"Para evitar que se muestre la información de fusiones pendientes del todo, "
+"use\n"
+"la opción no-pending o indique un archivo/directorio."
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+"Para comparar el directorio de trabajo con una revisión concreta, pase una\n"
+"única revisión como argumento a la revisión."
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+"Para ver que archivos han cambiado en una revisión concreta, o entre\n"
+"dos revisiones, pase un rango de revisiones al argumento de la revisión.\n"
+"Esto producirá los mismos resultados que llamar «bzr diff --summarize»."
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr "Usar indicadores de estado cortos."
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr "Solo mostrar archivos versionados."
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr "No mostrar fusiones pendientes."
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr "No marcar tipo de objeto usando indicador."
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+"bzr status --revision toma exactamente uno o dos especificadores de revisión"
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr "Puede suiministrar solo uno revision_id o --revision"
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr "Puede suiministrar ambos revision_id o --revision"
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr "El repositorio %r no permite acceso a textos de revisión en bruto"
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr "El repositorio {0} no contiene revisión {1}."
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr "No puede especificar una revisión NULL."
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr "Eliminar el árbol de trabajo de una rama/comprobación dada"
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+"Dado que una extracción ligera es poco más que un árbol de trabajo\n"
+"esto impedirá que se ejecute contra una."
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr "Para recrear el árbol de trabajo, use «bzr checkout»."
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+"Eliminar el árbol de trabajo incluso si tiene cambios no confirmados o "
+"archivados."
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr "No existe un árbol de trabajo para eliminar"
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr "No puede eliminar el árbol de trabajo de una ruta remota"
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr "No puede eliminar el árbol de trabajo desde una comprobación ligera"
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+"El árbol no parece estar corrupto. Probablemente quiera «bzr revert» en su "
+"lugar. Use «--force» si está seguro de que quiere reiniciar el árbol de "
+"trabajo."
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+", la cabecera parece corrupta, intente pasando -r -1 para establecer el "
+"estado del último envío"
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr "fallo al restablecer el estado{0} del árbol"
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr "Mostrar número de revisión actual."
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr "Esto es igual al número de revisiones en esta rama."
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr "--tree y --revision no se pueden usar juntos"
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+"Las etiquetas solo se pueden emplazar en una única revisión, no en un rango."
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr "Mostrar número de revisión del árbol de trabajo."
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr "Añadir archivos especificados o directorios."
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+"En el modo no recursivo, todos los puntos mencionados se añaden, \n"
+"sin tener en cuenta que hayan sido previamente ignorados. Se avisa si\n"
+"cualquiera de los archivos nombrados ya está versionado."
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+"En modo recursivo (predeterminado), los archivos se tratan de la misma "
+"manera\n"
+"pero el comportamiento para directorios es diferente. Los directorios que\n"
+"ya han sido versionados no generan un aviso. Todos los directorios,\n"
+"hayan sido versionados o no, son recorridos buscando archivos o\n"
+"subdirectorios que no hayan sido versionados o ignorados, y estos\n"
+"son añadidos. Esta búsqueda procede recursivamente por los directorios\n"
+"versionados. SI no se indican nombres se asume «.»."
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+"Por lo tanto, simplemente diciendo «bzr add» versionará todos los archivos\n"
+"desconocidos actualmente."
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+"Al añadir un archivos cuyo padre no esté versionado añadirá\n"
+"implícitamente al padre, y así sucesivamente hasta la raíz. Esto\n"
+"significa que nunca necesitaría añadir explícitamente un directorio,\n"
+"ya que serán añadidos cuando añada un archivo del directorio."
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+"--dry-run mostrará que archivos se pueden añadir, pero no los\n"
+"añade realmente."
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+"--file-ids-from intentará usar el archivo de ids de la ruta proporcionada.\n"
+"Busca ids intentado encontrar un directorio padre que coincida con el\n"
+"mismo nombre de archivo, y luego por ruta pura. Esta opción raramente\n"
+"se necesita pero puede ser útil al añadir el mismo archivo lógico en dos\n"
+"ramas que se fusionarán posteriormente (sin mostrar las dos adiciones\n"
+"diferentes como un conflicto). También es útil al fusionar otro proyecto\n"
+"en un subdirectorio de éste."
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+"Cualquier archivo que coincida con los patrones en la lista de ignorados no "
+"se añadirá\n"
+"salvo que se mencione explícitamente."
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+"En modo recursivo, los archivos mayores que la opción de configuración \n"
+"add.maximum_file_size se omitirán. Los elementos nombrados nunca se "
+"omitirán\n"
+"por su tamaño."
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr "No añade de manera recursiva los contenidos de los directorios."
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr "Buscar id de archivos desde este árbol."
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr "ignorado {0} coincidente «{1}»\n"
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr "Crear un directorio versionado nuevo."
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr "Esto es equivalente a crear el directorio y luego añadirlo."
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr "añadido %s\n"
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr "tipo inválido %r especificado"
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr "Mover o renombrar un archivo."
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr "    bzr mv ORIGEN... DESTINO"
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+"Si el último argumento es un directorio versionado, todos los demás nombres\n"
+"se moverán a él. De otra forma, deben haber exactamente dos argumentos\n"
+"y el archivo se cambia al nuevo nombre."
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+"Si NOMBREANTIGUO no existe en el sistema de archivos pero esta versionado y\n"
+"NOMBRENUEVO existe en el sistema de archivos pero no está versionado, mv\n"
+"asume que el archivo se ha movido manualmente y sólo actualiza su\n"
+"inventario interno para reflejar ese cambio.\n"
+"Lo mismo es válido cuando se mueven muchos archivos ORIGEN a un DESTINO."
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr "Los archivos no se pueden mover entre ramas."
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+"Mover solo el identificador bzr del archivo, porque el archivo ya ha sido "
+"movido."
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr "Adivinar automáticamente rel renombrado."
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr "Evitar hacer cambios cunado se adivina el renombrado."
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr "--dry-run requiere --auto."
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr "falta el argumento de archivo"
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr "no se puede mover la raíz de la rama"
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr "Solo se puede especificar una ruta a --auto"
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr "--after no se puede especificar con --auto."
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+"para hacer mv a múltiples archivos el destino debe ser un directorio "
+"versionado"
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr "Cambiar esta rama a una réplica de otra rama."
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+"Predeterminado, esta orden solo funciona en ramas que no han divergido.\n"
+"Las ramas se consideran divergidas si la confirmación más reciente de la \n"
+"rama destino es una que no ha sido fusionada (directa o indirectamente) \n"
+"en el padre."
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+"Si las ramas han divergido, puede usar «bzr merge» para integrar los "
+"cambios\n"
+"de una en la otra. Una vez que una rama se ha fusionado, la otra debería\n"
+"ser capaz de extraer de nuevo."
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+"Si quiere reemplazar su cambios locales y solo quiere que su rama\n"
+"coincida con la remota, use pull --overwrite. Esto funcionará incluso\n"
+"si las dos ramas han divergido."
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+"Si no hay ubicación predeterminada establecida, la primera extracción la \n"
+"establecerá (use --no-remember para evitarlo). Después puede omitir la \n"
+"ubicación para usar la predeterminada. Para cambiarla, use --remember. El\n"
+"valor solo se guardará si la ubicación remota es accesible."
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+"La opción --verbose mostrará las revisiones extraídas usando la opción de\n"
+"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
+"con -Olog_format=<otro_formato>."
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+"Nota: la ubicación se puede indicar bien en forma de una rama,\n"
+"o en forma de una ruta a un archivo conteniendo una directiva de\n"
+"fusión generada con bzr send."
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr "Mostrar registros de revisiones extraídas."
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+"Rama en la que extraer, en lugar de la que contiene el directorio de trabajo."
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+"Efectuar una extracción local en una rama ligada. Las extracciones locales "
+"no se aplican a la rama maestra."
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr "Se necesita árbol de trabajo para --show-base."
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr "Ubicación de extración no conocida ni indicada."
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr "Usar ubicaciones padre guardadas: %s\n"
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr "No se puede usar -r con directivas de fusión o paquetes"
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr "Actualizar una réplica de esta rama."
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+"El árbol de trabajo de la rama destino no se rellenará porque esto\n"
+"es tanto costoso como no soportado por sistemas de archivos remotos."
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+"Algunos servidores inteligentes o protocolos *pueden* poner el árbol de "
+"trabajo\n"
+"en su lugar en el futuro."
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+"Esta orden solo funciona en ramas que no han divergido. Las ramas se\n"
+"consideran divergidas si la confirmación más reciente de la rama destino es\n"
+"una que no ha sido fusionada (directa o indirectamente) por la rama origen."
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+"Si las ramas tienen divergencias, puede usar «bzr push --overwrite» para "
+"reemplazar\n"
+"la otra rama completamente, descartando sus cambios no fusionados."
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+"Si quiere asegurarse de que tiene los distintos cambios de la otra rama,\n"
+"haga una fusión (vea bzr help merge) desde la otra rama y confirmela.\n"
+"Después eso será capaz de hacer una inserción sin «--overwrite»."
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+"La opción --verbose mostrará las revisiones insertadas usando la opción de\n"
+"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
+"con -Olog_format=<otro_formato>."
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+"Rama desde la que impulsar en vez de la que contiene el directorio de "
+"trabajo."
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+"Por defecto «push» fallará si el directorio destino existe,  pero no tiene "
+"todavía un directorio de control. Este marcador permitirá a «push» proceder."
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+"Crear una rama apilada que referencia a la ubicación pública de la rama "
+"padre."
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+"Crear una rama apilada que se refiera a otra para historial de "
+"confirmaciones. Solo el trabajo no presente en la rama referenciada se "
+"incluye en la rama creada."
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+"Rechazar empujar si hay cambios sin ejecutar en el árbol de trabajo, --no-"
+"strict desactiva la comprobación."
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+"No rellenar el árbol de trabajo, incluso para los protocolos que lo permitan."
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr "No se puede determinar la rama a la que referirse."
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+"Ubicación de inserción no conocida ni indicada. Para insertar en la rama "
+"padre (en %s), use «bzr push :parent»."
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr "No hay una ubicación para impulsar conocida o especificada."
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr "Usar la ubicación para impulsar guardada: %s"
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr "Crea una nueva rama que es una copia de la rama existente."
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+"Para conseguir la rama de una revisión particular, proporcione el parámetro -"
+"-revision\n"
+"como en «branch foo/bar -r 5»."
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr "Los sinónimos «clone» y «get» para esta orden están obsoletos."
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr "Crear una rama sin directorio de trabajo."
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr "Cambiar la comprobación en el directorio actual a la rama nueva."
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+"Crear una rama apilada refiriéndose a la rama origen. La nueva rama "
+"dependerá de la disponibilidad de la rama fuente para todas las operaciones."
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr "No usar un repositorio compartido, incluso si está disponible."
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+"Por defecto «branch» fallará si el directorio destino existe, pero no tiene "
+"todavía un directorio de control. Este marcador permitirá a «branch» "
+"proceder."
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr "Vincular una rama nueva desde la ubicación."
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr "El directorio objetivo «%s» ya existe."
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr "El padre de «%s» no existe."
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr "La rama {0} no tiene revisión {1}."
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr "Creada rama apilada nueva referida a %s."
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] "%d revisión enramada"
+msgstr[1] "%d revisiones enramadas"
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr "Nueva rama unida a %s"
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr "Cambiado a la rama: %s"
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr "Lista las ramas disponibles en la ubicación actual."
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+"Esta orden imprimirá los nombres de todas las ramas en la ubicación\n"
+"actual."
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+"Buscar recursivamente en las ramas en lugar de mirar solo en la ubicación "
+"indicada."
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr "(predeterminado)"
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr "Crea una nueva comprobación de una rama existente."
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+"Para recuperar la rama de una revisión particular, proporcione el parámetro\n"
+"--revision, como en «checkout foo/bar -r 5». Note que esto estará "
+"inmediatamente\n"
+"desfasado [por lo que no puede confirmar] pero aún así puede ser útil (por \n"
+"ejemplo, para examinar código antiguo)."
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+"Realizar una extracción ligera. Las extracciones ligeras depende del acceso "
+"a la rama para cada operación. Las extracciones normales pueden realizar "
+"operaciones habituales como diff y status sin este acceso, así como permitir "
+"confirmaciones locales."
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr "Conseguir contenidos de archivo desde este árbol."
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+"Vincular de forma dura los archivos del árbol de trabajo donde sea posible."
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+"Mostrar la lista de archivos renombrados\n"
+"    "
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr "Actualiza un árbol de trabajo a una revisión nueva."
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+"Efectuará una fusión de la revisión de destino (el extremo de la\n"
+"rama, o la revisión indicada) en el árbol de trabajo, y hará esa\n"
+"revisión la revisión base del árbol de trabajo.  "
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+"Puede usar esto para visitar una revisión antigua, o para actualizar un "
+"árbol de trabajo\n"
+"que esté desactualizado de su rama."
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+"Si la rama del árbol esta atada a una rama superior, bzr también "
+"actualizará\n"
+"la rama de la superior."
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr "bzr update --revision toma exactamente una revisión"
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+"bzr update solo puede actualizar todo un árbol, no un archivo o subdirectorio"
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr "El árbol está actualizado en la revisión {0} de la rama {1}"
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+"la rama no tiene revisión %s\n"
+"bzr update --revision solo funciona para una revisión en el histórico de la "
+"rama"
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr "Actualizado a la revisión {0} de la rama {1}"
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+"Sus confirmaciones locales serán ahora mostradas como fusiones pendientes "
+"con «bzr status», y pueden ser confirmadas con «bzr commit»."
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr "Muestra información sobre un árbol de trabajo, rama o repositorio."
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+"Esta orden mostrará todas las ubicaciones conocidas y formatos asociados a\n"
+"árbol, rama o repositorio."
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+"Las ramas y los árboles de trabajo informarán también de cualquier revisión "
+"que falte."
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ":Ejemplos:"
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr "  Muestra información en el formato y ubicaciones relacionadas:"
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr "    información bzr"
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr "    bzr info -v"
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr "  Mostrar lo anterior junto con el número de aplicadores de la rama:"
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr "    bzr info -vv"
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr "Elimina archivos o directorios."
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr "Eliminar solo los archivos que nunca se han aplicado."
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr "El modo de borrado de archivo a usar."
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr "Estrategia de borrado"
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr "Copiar archivos modificados (predeterminado)."
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr "Borrar de bzr pero dejar la copia de trabajo."
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr "No copiar los archivos modificados."
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+"Borrar todos los archivos indicados, incluso si no pueden ser recuperados y "
+"aunque existan directorios no vacíos (obsoleto, use no-backup)."
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+"(La opción --force está obsoleta, en su lugar use --no-backup en el futuro)"
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr "No hay archivos coincidentes."
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr "Reconcilia metadatos  bzr en una rama."
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+"Al mismo tiempo que se ejecuta, puede comprimir los datos resultando\n"
+"un ahorro potencial de espacio en disco o aumento el rendimiento."
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+"La rama *DEBE* estar en un sistema que se pueda listar tal como disco local "
+"o sftp."
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr "Hacer un directorio en una rama versionada."
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+"Use esto para crear una rama nueva o antes de importar un\n"
+"proyecto existente."
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+"SI hay un repositorio en un directorio padre de la ubicación, el\n"
+"historial de la rama se almacenará en el repositorio. En otro caso\n"
+"init crea una rama independiente que lleva su propio historial \n"
+"en el directorio .bzr."
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+"Si existe ya una rama en la ubicación, pero no tiene árbol de trabajo,\n"
+"se puede poblar el árbol con «bzr checkout»."
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr "Recipiente para importar un árbol de archivos:"
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m «proyecto importado»"
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr "Crea la ruta que conduce a la rama si no existe ya."
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr "Especificar un formato para esta rama. Vea «help formats»"
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr "Crea una rama sin árbol de trabajo."
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+"Este formato de rama no se puede establecer como append-revisions-only.  "
+"Intente --default."
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr "Creado un {0} (formaot: {1})\n"
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr "Usando el repositorio compartido: %s\n"
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+"Crea un repositorio compartido para ramas para compartir el espacio de "
+"almacenamiento."
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+":Ejemplos:\n"
+"    Crear un repositorio compartido manteniendo solo las ramas::"
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr "    Hace una comprobación ligera en cualquier sitio::"
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+"Especificar un formato para este repositorio, Vea «bzr help formats» para "
+"tener más detalles."
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr "Formato de repositorio"
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+"Las ramas en el repositorio no tendrán de manera predeterminada un árbol de "
+"trabajo."
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+"Muestra diferencias en el árbol de trabajo, entre revisiones o ramas."
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+"«bzr diff -p1» es equivalente a «bzr diff --prefix old/:new/», y\n"
+"produce parches adecuados para «patch -p1»."
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+":Valores de salida:\n"
+"    1 - cambiado\n"
+"    2 - cambios no representables\n"
+"    3 - error\n"
+"    0 - sin cambios"
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+":Ejemplos:\n"
+"    Muestra las diferencias en el árbol de trabajo contra la última "
+"aplicación::"
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr "        bzr diff"
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr "    Diferencia entre el árbol de trabajo y la revisión 1::"
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr "        bzr diff -r1"
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr "    Diferencia entre revisión 3 y revisión 1::"
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr "        bzr diff -r1..3"
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr "    Diferencia entre revisión 3 y revisión 1 para la rama xxx::"
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr "        bzr diff -r1..3 xxx"
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+"    Los cambios introducidos por la revisión 2 (equivalente a -r1..2)::"
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr "        bzr diff -c2"
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+"    Para ver los cambios introducidos por la revisión X::\n"
+"    \n"
+"        bzr diff -cX"
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr "        bzr diff -r<padre_elegido>..X"
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+"    Los cambios entre la versión actual y la previa\n"
+"    (equivalente a -c-1 y -r-2..-1)"
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr "        bzr diff -r-2.."
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr "    Solo muestra las diferencias para el archivo NEWS::"
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr "        bzr diff NEWS"
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+"    Muestra las diferencias en el árbol de trabajo xxx para el archivo NEWS::"
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr "        bzr diff xxx/NEWS"
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+"    Muestra la diferencias desde la rama xxx a este árbol de trabajo:"
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr "        bzr diff --old xxx"
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr "    Muestra las diferencias entre dos ramas para el archivo NEWS:"
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr "        bzr diff --old xxx --new yyy NEWS"
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+"    Igual que «bzr diff» pero pone el prefijo a las rutas old/ y new/::"
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr "Pasa esta opciones para el programa diff externo."
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr "Rama/árbol desde donde comparar."
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr "Rama/árbol a la que comparar."
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr "Use esta orden para comparar archivos."
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr "Formato diff a usar."
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr "Formato diff"
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+"--prefix espera dos valores separados por dos puntos (ej. «old/:new/»)"
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+"bzr diff --revision toma exactamente uno o dos especificadores de revisión"
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr "{0} y {1} se excluyen mutuamente"
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+"Lista archivos eliminados en el árbol de trabajo.\n"
+"    "
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr "Muestra el directorio raíz del árbol."
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr "El argumento límite debe ser un entero."
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr "Los argumentos de niveles deben ser un entero."
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+"Muestra el registro histórico de una rama o un subconjunto de una rama."
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+"  bzr log                       registra la rama actual\n"
+"  bzr log foo.py                registra un archivo en esta rama\n"
+"  bzr log http://servidor/rama  registra una rama en un servidor"
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ":Control de saliuda:"
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+"  Las siguientes opciones se pueden usar para controlar qué información\n"
+"  se muestra::"
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ":Control de ordenación:"
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ":Filtrado de revisión:"
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+"    -rX      muestra revisión X\n"
+"    -rX..    muestra revisión X y posterior\n"
+"    -r..Y    muestra hasta la revisión Y inclusive\n"
+"    -rX..Y   muestra desde X a Y inclusive"
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+"  Vea «bzr help revisionspec» para tener más detalles sobre como especificar "
+"X e Y.\n"
+"  Más abajo se listan algunos ejemplos::"
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ":Filtrado de ruta:"
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+"  Si se dan los parámetros y el primero no es una rama, el registro\n"
+"  se filtrará para mostrar solo las revisiones que cambiaron los\n"
+"  archivos o directorios nominados."
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+"  * revisión 1: añadir tutorial.txt\n"
+"  * revisión 2: modificar tutorial.txt\n"
+"  * revisión 3: renombrar tutorial.txt a guide.txt; añadir tutorial.txt"
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr "  en este caso:"
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+"  * ``bzr log guide.txt`` registrará el archivo añadido en revisión 1:"
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+"  * «bzr log tutorial.txt» registrará el nuevo archivo añadido en la "
+"revisión 3"
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+"  * «bzr log -r2 -p tutorial.txt» mostrará los cambios realizados al\n"
+"    archivo original en la revisión 2."
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ":Otro filtrado:"
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ":Trucos y consejos:"
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+"    [ALIAS]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+"  Si está interesado en mirar más profundamente en una fusiòn X particular,\n"
+"  use «bzr log -n0 -rX»."
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr "Muestra desde el más antiguo al más moderno."
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr "Muestra los archivos cambiados en cada revisión."
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+"Muestra solo la revisión especificada. Vea también «help revisionspec»."
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr "Autores"
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr "Número de niveles a mostrar -0 para todo, 1 para plano."
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr "Límite de salida para las primeras N revisiones."
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr "Mostrar cambios realizados en cada revisión como un parche."
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr "No informar de ejecuciones con más de un padre."
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr "Mostrar revisiones cuyas propiedades coincidan con esta expresión."
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr "Mostrar revisiones cuyos mensajes coincidan con esta expresión."
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr "Mostrar revisiones cuyos ejecutores coincidan con esta expresión."
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr "Mostrar revisiones cuyos autores coincidan con esta expresión."
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr "Mostrar revisiones cuyos errores coincidan con esta expresión."
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr "--exclude-common-ancestry requieren -r con dos revisiones"
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr "Ruta desconocida en el principio o final del rango de revisión: %s"
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr "bzr %s no acepta dos revisiones en diferentes ramas."
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr "bzr %s --revision toma uno o dos valores."
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+"Lista archivos en un árbol\n"
+"    "
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr "Imprime rutas relativas a la raíz de la rama."
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr "Imprimir archivos desconocidos."
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr "Imprimir archivos versionados."
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr "Imprimir archivos ignorados."
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+"Lista entradas de un tipo particular; archivo, directorio, vínculo simbólico."
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr "tivo inválido especificado"
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr "No se pueden establecer ambos --verbose y --null"
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr "No se pueden establecer ambos --from-root y PATH"
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr "Ignorar archivos o patrones especificados."
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+"Vea «bzr help patterns» para tener detalles sobre la sintaxis de patrones."
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+"Para eliminar los patrones de la lista de ignorados, edite el archivo "
+".bzrignore.\n"
+"Después de añadir, editar o borrar el archivo o bien indirectamente por\n"
+"el uso de esta orden, o directamente mediante un editor, asegúrese de "
+"ejecutarlo."
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr "        bzr ignore ./Makefile"
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr "    Ignorar archivos .class en todos los directorios...::"
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr "        bzr ignore \"*.class\""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr "    ...pero no ignora «special.class»::"
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr "        bzr ignore «!special.class»"
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr "    Ignorar archivos cuyos nombres comiencen con el carácter «#»::"
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr "        bzr ignore \"RE:^#\""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr "    Ignorar archivos .o bajo el directorio lib::"
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr "        bzr ignore \"lib/**/*.o\""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr "        bzr ignore \"RE:lib/.*\\.o\""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+"    Ignorar todo excepto el directorio de nivel superior de «debian»::"
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr "Muestra las reglas de ignorado predeterminada que usa bzr."
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] "Se encontró un patrón de ignorado inválido. %s"
+msgstr[1] "Se encontraron patrones de ignorado inválidos. %s"
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr "NAME_PATTERN no debe ser una ruta absoluta"
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr "Lista todos los archivos ignorados y patrones que conciden."
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr "Alternativamente, lista solo los archivos:"
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr "    bzr ls --ignored"
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr "no es un número de revisión válido: %r"
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+"Exporta la revisión actual o pasada a un directorio de destino o un "
+"archivador."
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr "Si no se especifica revisión, exporta la última revisión ejecutada."
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+"Si se omite la rama entonces se usa la rama que contiene el directorio\n"
+"de trabajo actual."
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+"Nota: no se puede exportar un aŕbol con nombres de archivo no ASCII a zip."
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+"  =================       ===================================\n"
+"  Formatos permitidos        Detectados automáticamente por extensión\n"
+"  =================       ===================================\n"
+"     dir                         (ninguno)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ==================================="
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr "Tipo de archivo para exportar."
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+"Aplicar los filtros de contenido para exportar el formulario conveniente."
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr "Nombre del directorio raíz dentro del archivo exportado."
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+"Establecer la fecha de modificación de los archivos a la de la última "
+"revisión en la que se cambió."
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr "Formato de exportación no permitido: %s"
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+"Escribir los contenidos de un archivo como una revisión dada a la salida "
+"estándar."
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr "SI no hay una revisión nominada, se usa la última revisión."
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr "La ruta en el árbol antiguo."
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr "bzr cat --revision toma específicamente un especificador de revisión"
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr "{0!r} no está presente en la revisión {1}"
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr "Ejecutar cambios en una revisión nueva."
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr "    bzr commit foo -x foo/bar"
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr "  No está permitida una ejecución selectiva después de una fusión."
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ":Autores personalizados:"
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ":Comprobaciones:"
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ":Cosas a tener en cuenta:"
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr "No considerar los cambios realizados en una ruta dada."
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr "Descripción de la revisión nueva."
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr "Ejecutar incluso si no ha cambiado nada."
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr "Tomar el mensaje de ejecución desde este archivo."
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+"Rechazar la ejecución si hay archivos desconocidos en el árbol de trabajo."
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+"Establecer manualmente la hora de ejecución usando un formato de  fecha de "
+"ejecución, por ejemplo «2009-10-10 08:00:00 +0100»."
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+"Marca que un error se ha arreglado en esta revisión (vea «bzr help bugs»)."
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+"Establecer el nombre del autor, si este es diferente al del ejecutor."
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr "Error no reconocido %s. Ejecución rechazada."
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+"%s\n"
+"Ejecución rechazada."
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr "No se puede analizar --commit-time: "
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr "especifique uno --message o --file"
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr "especifique un mensaje de ejecución con --message o --file"
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+"No hay cambios que ejecutar.  «bzr add» los archivos que quiera ejecutar o "
+"use --unchanged para forzar una ejecución vacía."
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+"Conflictos detectados en el árbol de trabajo.  Use «bzr conflicts» para "
+"listar, «bzr resolve ARCHIVO»\" para resolver."
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+"Ejecución rechazada porque hay archivos desconocidos en el árbol de trabajo."
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+"Valida la estructura del árbol de trabajo, la consistencia de la rama y el "
+"historial del repositorio."
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+"revisions\n"
+"    Esto es solo el número de revisiones comprobadas, No\n"
+"    indica un problema."
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+"versionedfiles\n"
+"    Esto es solo el número de archivos versionados comprobados.. No\n"
+"    indica un problema."
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr "    Comprueba el árbol y la rama en «foo»::"
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr "        bzr check --tree --branch foo"
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr "    Comprueba solo el repositorio en «bar»::"
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr "        bzr check --repo bar"
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr "    Comprueba todo en «baz»::"
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr "        bzr check baz"
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr "Comprueba la rama relacionada con el directorio actual."
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr "Comprueba el repositorio relacionado con el directorio actual."
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr "Comprueba el árbol de trabajo relacionado con el directorio actual."
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr "Actualiza un repositorio, rama o árbol de trabajo al formato nuevo."
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+"Para tener más información sobre actualizaciones, vea la Guía de "
+"actualización de Bazaar,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+"Actualizar a un formato específico.  Vea «bzr help formats» para tener más "
+"detalles."
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr "Formato de la rama"
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr "Elimina el directorio backup.bzr si tiene éxito."
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr "Muestra o establece la id de usuario bzr."
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+":Ejemplos:\n"
+"    Muestra el correo del usuario actual::"
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr "        bzr whoami --email"
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr "    Establece el usuario actual::"
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr "        bzr whoami «Frank Chu <fchu@example.com>»"
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr "Muestra solo la dirección de correo."
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr "Establece la identidad de la rama actual en lugar de globalmente."
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr "--email solo se puede usar para mostrar la identidad del directorio"
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr "Muestra o establece el apodo de la rama."
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr "Establece/desestablece y muestra alias."
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+":Ejemplos:\n"
+"    Muestra los alias actuales::"
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr "        bzr alias"
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr "    Muestra los alias especificados por «ll»::"
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr "        bzr alias ll"
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr "    Establece un alias para «ll»::"
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr "        bzr alias ll=\"log --line -r-10..-1\""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr "    Para eliminar un alias de «ll»::"
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr "        bzr alias --remove ll"
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr "Elimina los alias."
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+"--benchmark ya no está permitido en bzr 2.2; use bzr-usertest en su lugar"
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr "Muestra la versión de bzr."
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr "Solamente imprime el número de versión."
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr "¡Seguro que si!\n"
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr "Realiza una fusión de tres vías."
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+"Los números de revisión están siempre relacionados con la rama origen."
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+"Use bzr resolve cuando tenga un problema arreglado.  Vea también bzr "
+"conflicts."
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+":Ejemplos:\n"
+"    Para fusionar todas las revisiones nuevas de bzr.dev::"
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr "        bzr merge ../bzr.dev"
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr "    Para fusionar cambios e incluir la revisión 82 desde bzr.dev::"
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr "        bzr merge -r 82 ../bzr.dev"
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+"    Para fusionar los cambios introducidos por 82, sin cambios previos::"
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr "        bzr merge -r 81..82 ../bzr.dev"
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr "    Para aplicar una directiva de fusión contenida en /tmp/merge::"
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr "        bzr merge /tmp/merge"
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr "Fusionar incluso si el árbol de destino tiene cambios sin ejecutar."
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+"Aplicar cambios no ejecutados desde una copia de trabajo, en vez de cambios "
+"de rama."
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr "Seleccionar cambios de manera interactiva."
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr "No se puede usar --uncommitted y --revision al mismo tiempo."
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr "fusión: "
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr "Nada que hacer."
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr "No se puede tirar de archivos individuales"
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr "Esta rama no tiene ejecuciones. (quizá prefiera «bzr pull»)"
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr "Show-base no está permitido en este tipo de fusión. %s"
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+"La reducción de conflicot no está permitida para el tipo de fusión %s."
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr "No hay ubicación especificada o recordada"
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr "Rehacer una fusión."
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr "        bzr remerge --show-base"
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr "Mostrar el texto de revisión base en los conflictos."
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr "Revierte los archivos a la revisión previa."
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr "No guardar respaldos de los archivos revertidos"
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+"Eliminar el marcador de fusión pendiente, sin cambiar ningún archivo."
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+"Muestra ayuda en una orden u otro tema.\n"
+"    "
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr "Muestra ayuda en todas las órdenes"
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr "Mostrar revisiones sin fusionar/extraer entre dos ramas."
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr "OTHER_BRANCH puede ser local o remoto."
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr "        bzr missing"
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr "    Determina las revisiones perdidas entre esta y otra rama::"
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr "        bzr missing http://server/branch"
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr "        bzr missing -r ..-10"
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr "        bzr missing --my-revision ..-10"
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr "Revierte el orden de las revisiones."
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr "Muestra cambios solo en la rama local."
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr "Lo mismo que --mine-only."
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr "Muestra cambios solo en la rama remota."
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr "Lo mismo que --theirs-only."
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+"Filtro en otras revisiones de rama (inclusive). Vea «help revisionspec» para "
+"tener más detalles."
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+"Filtro en revisiones locales de rama (inclusive). Vea «help revisionspec» "
+"para tener más detalles."
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr "No hay ubicación del par conocida o especificada."
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr "Usar ubicación padre guardada: {0}\n"
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] "Tiene %d revisión extra:\n"
+msgstr[1] "Tiene %d revisiones extra:\n"
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] "Tiene %d revisión perdida:\n"
+msgstr[1] "Tiene %d revisiones perdidas:\n"
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr "Esta rama no tiene revisiones.\n"
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr "Otra rama no tiene revisiones nuevas.\n"
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr "La rama está actualizada:\n"
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr "Comprime los datos en un repositorio."
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr "Elimina paquetes obsoletos para ahorrar espacio de disco."
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr "Lista los complementos instalados."
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+"Esta orden muestra la lista de complementos instalados incluyendo\n"
+"versión  del complemento y una breve descripción de cada uno."
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr "--verbose muestra la ruta donde está ubicado cada complemento."
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr "Produce testamento en formato largo."
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr "Produce testamento en formato estricto."
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr "Muestra el origen de cada línea en un archivo"
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr "Muestra anotaciones en todas las líneas."
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr "Muestra la fecha de ejecución en anotaciones."
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr "Proporcione una revisión o un rango."
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+"No se proporcionó ubicación. Este formato no recuerda antiguas ubicaciones."
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr "La rama ya está asociada"
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr "No se proporcionó ubicación y no hay ubicación previa conocida"
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+"Las ramas tienen divergencias. Intente fusionar y vincularlas de nuevo."
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr "Convertir la comprobación actual en una rama regular."
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr "La rama local no está vinculada"
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr "Elimina la última revisión ejecutada."
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr "En relaidad no hace cambios."
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr "Decir sí a todas las preguntas."
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr "Mantener etiquetas que apuntan a eliminar revisiones."
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+"Solo elimina ejecuciones de la rama local cuando se está en una comprobación."
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr "No hay revisiones para desejecutar.\n"
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr "Las revisiones de arriba se eliminarán.\n"
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr "Desejecutar estas revisiones"
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr "Cancelado\n"
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+"Puede restaurar el consejo antiguo ejecutando:\n"
+"  bzr pull . -r revid:%s\n"
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr "Romper un bloqueo."
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+"Esta orden rompe un bloqueo en un repositorio, rama, directorio de trabajo "
+"o\n"
+"archivo de configuración."
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+":Ejemplos:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr "No pedir confirmación antes de romper el bloqueo."
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr "Ejecutar el servidor bzr."
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr "protocolo"
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr "Protocolo a servir."
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr "Combina un árbol en su árbol contenedor."
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr "No se puede unir {0}.  {1}"
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr "Divide un subdirectorio de un árbol en un árbol separado."
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr "No se ha enviado una rama especificada o conocida"
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr "No hay una rama especificada o conocida pública"
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+"* Una ruta opcional que es una vista previa de los cambios requeridos"
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr "Escribir la directiva de fusión a este archivo; use - for stdout."
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr "Enviar por correo la petición a esta dirección"
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr "Cuerpo para el correo."
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr "No incluir una ruta de vista previa en la directiva de fusión."
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr "Recordar el envío y la rama pública."
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr "formato"
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr "Usar el formato de salida especificado."
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr "Crea, elimina o modifica una etiqueta que nombra una revisión."
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr "Eliminar esta etiqueta en lugar de colocarla."
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr "Reemplazar las etiquetas existentes."
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr "No hay etiquetas especificadas para eliminar."
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr "Etiqueta%s eliminada."
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr "Especifique un nombre de etiqueta."
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr "La etiqueta %s existe para esta revisión."
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr "Etiqueta %s creada."
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr "Etiqueta actualizada %s."
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr "Listar etiquetas."
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr "Rama cuyas etiquetas se deben mostrar."
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr "Ordenar etiquetas con diferentes criterios."
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr "Ordenación"
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr "Reconfigura el tipo de un directorio bzr."
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr "Se debe especificar una configuración objetivo."
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr "Tipo de árbol"
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr "La relación entre rama y árbol."
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr "Tipo de repositorio"
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr "Ubicación en el repositorio."
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr "Árboles en el repositorio"
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr "Si las ramas nuevas en el repositorio tienen árboles."
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+"Realizar reconfiguración incluso si se han perdido los cambios locales."
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr "Reconfigurar una rama para apilarla en otra rama."
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr "No se pueden usar ambos --stacked-on y --unstacked"
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr "No se ha especificado una configuración objetivo"
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr "Establezca la rama de una comprobación y actualización."
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr "Cambiar incluso si las ejecuciones se han perdido."
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr "Debe especificar una revisión o una ubicación"
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr "no se puede crear una rama sin rama origen"
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr "Gestionar vistas filtradas."
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+":Ejemplos:\n"
+"  Para definir la vista actual::"
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr "    bzr view file1 dir1 ..."
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr "  Para listar la vista actual::"
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr "    vista bzr"
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr "  Para eliminar la vista actual::"
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr "    bzr view --delete"
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr "  Para desactivar la vista actual sin eliminarla::"
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr "    bzr view --switch off"
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr "    bzr view --name view-name file1 dir1 ..."
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr "  Para lista la vista nombrada::"
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr "    bzr view --name view-name"
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr "  Para eliminar una vista nombrada::"
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr "    bzr view --name view-name --delete"
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr "  Para cambiar a una vista nombrada::"
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr "    bzr view --switch view-name"
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr "  Para listar todas las vistas definidas::"
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr "    bzr view --all"
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr "  Para eliminar todas las vistas::"
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr "    bzr view --delete --all"
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr "Eliminar la vista."
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr "Nombre de la vista a definir, listar o eliminar."
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr "Nombre de la vista a la que cambiar."
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr "Ambos --delete y --switch especificados"
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr "Eliminar todas las vistas.\n"
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr "No hay vista para eliminar"
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr "Vista «%s» eliminada.\n"
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr "Ambos --switch y --all especificados"
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr "No hay vista actual que desactivar"
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr "Vista «%s» desactivada.\n"
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr "Usar «{0}» vista: {1}\n"
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr "Vistas definidas:\n"
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr "No hay vista definida.\n"
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr "No hay vista actual.\n"
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr "«{0}» vista es: {1}\n"
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr "Eliminar una rama."
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr "  Eliminar la rama en repo/trunk::"
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr "    bzr remove-branch repo/trunk"
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+"Si se especifica una revisión, los cambios realizados desde esta revisión "
+"serán archivados."
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr "Guardar todos los cambios."
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr "Método a usar para escribir diferencias."
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr "escritor"
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr "Listar cambios guardados."
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr "Destruir cambios eliminados en vez de guardarlos."
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr "No ha cambios guardados."
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr "Restaurar cambios guardados."
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr "La acción a realizar."
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr "acción"
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr "Eliminar archivos no deseados desde el árbol de trabajo."
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr "Eliminar todos los archivos ignorados."
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr "Eliminar archivos desconocidos de bzr (predeterminado)."
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr "Mostrar archivos a eliminar en vez de eliminarles."
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr "No preguntar antes de eliminar."
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+"haciendo respaldo de {0}\n"
+"  a {1}"
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr "renombrado {0} a {1}"
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr "iniciar conversión de repositorio"
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr "marcar"
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr "marcar revisiones"
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr "%6d revisiones"
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr "%6d versiones de texto no referenciadas"
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr "versión no referenciada: {{{0}}} en {1}"
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr "%6d padres inconsistentes"
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr "Comprobando rama en «%s»."
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr "Comprobando árbol de trabajo en «%s»."
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr "No se ha encontrado rama en la ubicación especificada."
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr "No se ha encontrado árbol de trabajo en la ubicación especificada."
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr "Comprobando repositorio en «%s»."
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr "No se ha encontrado repositorio en la ubicación especificada."
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr "Nada que eliminar."
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr "imposible eliminar %s"
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr "eliminar rutas:"
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr "imposible eliminar «{0}»: {1}."
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr "No hay archivos eliminados."
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr "Mostrar la información de la versión acerca de este árbol."
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr "Por ejemplo::"
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr "Seleccionar el formato de salida."
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr "Incluir toda la información posible."
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr "Comprobar si el árbol está limpio."
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr "Plantilla para la salida."
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr "orden «%s» desconocida"
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr "No hay ayuda para esta orden."
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ":Propósito: %s\n"
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+":Uso:\n"
+"%s\n"
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ":Uso:   %s\n"
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ":Opciones:%s"
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+":Descripción:\n"
+"  %s\n"
+"\n"
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ":Alias:  "
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ":Desde:     complemento «%s»\n"
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ":doc:`{0} <{1}-help>`"
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ":Vea también: %s"
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr "Solo se permiten nombres de opción en ASCII"
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr "la orden {0!r} necesita una o más {1}"
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr "la orden {0!r} necesita un argumento {1}"
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr "Datos de perfil escritos en «%s»"
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr "añadido"
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr "modificado"
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr "eliminado %s"
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr "falta %s"
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr "renombrado"
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr "sin cambios"
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr "Verificar todas las firmas de ejecución."
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr "Resolver todos los conflictos es este árbol."
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr "Mantener conflictos:"
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr "Todos los conflictos resueltos."
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr "{0} es{1} redirigido a {2}"
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr "Error en las opciones de la línea de órdenes"
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr "No hay cambios que ejecutar."
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr "Error en el archivo versiondao"
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr "Demasiadas redirecciones"
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr "Nada a fusionar."
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr "Error en el formato modificado de fusión"
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr "El servidor envió un error inesperado: %(error_tuple)r"
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr "Final inesperado del flujo del contenedor"
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr "Tipo de registro inesperado: %(record_type)r"
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr "Registro inesperado: %(reason)s"
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr "Error SMTP: %(error)s"
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr "No se ha proporcionado mensaje."
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+"No se a especificado una dirección de correo a enviar (--mail-to) o salida (-"
+"o)."
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr "Correo de cliente desconocido: %(mail_client)s"
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr "Las conexiones SMTP a %(host)s se han rechazado"
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr "«%(display_url)s» ya es una la rama."
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr "«%(display_url)s» ya es un árbol."
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr "«%(display_url)s» ya es una comprobación."
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr "«%(display_url)s» ya es una comprobación ligera."
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr "«%(display_url)s» ya está usando un repositorio compartido."
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr "«%(display_url)s» ya es autónomo."
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr "No se encontró ubicación a donde vincular %(display_url)s."
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr "La variable {%(name)s} no está disponible."
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr "No se ha especificado una plantilla."
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr "Imposible crear un vínculo simbólico %(path_str)s en esta plataforma"
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+"Formato de zona horaria «%(timezone)s» no permitido , las opciones son«utc», "
+"«original», «local»."
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr "Reglas detectadas desconocidas: %(unknowns_str)s."
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr "El usuario abortó la operación."
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr "Se encontró un patrón inválido. %(msg)s"
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr "Exportando mensaje del error: %s"
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr "Buscando revisiones"
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr "Obteniendo revisiones"
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr "Usando las ubicaciones guardadas: %s\n"
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr "{0} ejecuciones con firmas válidas"
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] "{0} ejecución con clave desconocida"
+msgstr[1] "{0} ejecuciones con claves desconocidas"
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] "{0} ejecución inválida"
+msgstr[1] "{0} ejecuciones inválidas"
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] "{0} ejecución no firmada"
+msgstr[1] "{0} ejecuciones no firmadas"
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr "No hay resultados de la clave GnuPG para el patrón: {0}"
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr "anotar"
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr "--exclude-common-ancestry requiere dos revisiones diferentes"
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr "dirección %r inválida"
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr "El inicio de la revisión debe ser anterior al final."
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] "error areglado"
+msgstr[1] "errores arreglados"
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr "Cambios aplicados con éxito."
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr "%d conflictos encontrados."
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr "Importar revisiones"
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr "Mostrar mensaje de ayuda."
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr "Mostrar solo errores y avisos."
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr "Mostrar mensaje de uso y opciones."
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr "Mostrar más información."
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr "Usar el formato de registro especificado."
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr "Formato de registro"
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr "Seleccionar un algoritmo de fusión particular."
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr "Algoritmo de fusión"
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr "Cadena de mensaje."
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr "Recordar la ubicación especificada como predeterminada."
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr "Reprocesar para reducir los conflictos espurios."
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr "Consulte «help revisionspec» para obtener más detalles."
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr "Mostrar las id de los objetos internos."
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr "lstat/stat de ({0!r}): {1!r}"
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr "Nombre de la función generada (predeterminado: _bzr)"
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr "Registrar una rama con launchpad.net."
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr "Nombre corto del proyecto de Launchpad para asociar con la rama."
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr "El error que arregla esta rama."
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr "Abrir una página de rama de Launchpad en su navegador web."
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr "Mostrar o establecer el ID de usuario de Launchpad."
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr "      bzr launchpad-login"
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr "      bzr launchpad-login bob"
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr "No comprueba que el nombre de usuario sea válido."
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr "Mensaje de ejecución."
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr "Marcar el propuesto como aprobado inmediatamente."
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr "Revisor solicitado y tipo opcional."
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr "Buscar el propuesto para fusionar esta revisión."
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr "  bzr lp-find-proposal -r annotate:README:1"
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr "Rama nueva creada."
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr "Reconciliando rama %s"
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr "Reconciliando repositorio %s"
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr "Reconciliando repositorio"
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr "Reconciliación completa."
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr "Leyendo los datos de inventario"
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr "Respaldando inventario"
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr "Inventario regenerado."
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr "Leyendo índices"
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr "{0} está ahora apilado en {1}\n"
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr "bzr: ERROR (ignorado): %s"
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr "Calculando hashes"
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr "{0} => {1}"
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr "Creando repositorio nuevo"
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr "Copiar contenido"
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr "repositorio convertido"
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr "Usando {0} {1}"
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr "No hay revisiones para enviar."
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr "¿Arrinconar?"
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr "Cambios seleccionados destruidos."
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr "Cambios seleccionados:"
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr "¿Eliminar archivo «%(path)s»?"
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr "¿Aplicar cambios binarios?"
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr "¿Añadir archivo «%(path)s»?"
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr "¿Aplicar %d cambio(s)?"
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr "¿Aplicar cambio?"
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr "No se han arrinconado cambios."
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr "Mensaje: %s"
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr "Aplicar fase"
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr "eliminar archivo"
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr "añadiendo archivo"
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr "Construyendo árbol"
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr "Añadiendo contenidos de archivo"
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr "Actualizando bzrdirs"
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr "Actualizando %s"
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr "Actualizando {0} {1} ..."
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr "textos"
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+"  bzr log            muestra el historial de cambios\n"
+"  bzr check          valida el almacenamiento"
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr "Órdenes básicas"
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr "Ramas"
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr "Órdenes relacionadas"
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr "Configuración del seguimiento de errores"
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr "Comrpobaciones"
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr "información sobre lo que es una comprobación"
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr "Ayuda básica para todas las órdenes"
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr "Detalles de las configuraciones disponibles"
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr "Tipos de conflicto y qué hacer con ellos"
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr "Opciones para mostrar o grabar información de depuración"
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr "Variables de entorno"
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr "Nombres y valores de variables de entorno"
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr "Archivos"
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr "Información sobre configuración y archivos de registro"
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr "Formatos de almacenamiento"
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+"\n"
+".. nota::"
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr "Información para escoger un formato de almacenamiento"
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr "Opciones globales"
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+"Visite http://doc.bazaar.canonical.com/developers/profiling.html para tener\n"
+"más información del perfilado."
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr "Opciones que controlan como se ejecuta Bazaar"
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr "Todas las órdenes ocultas"
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr "Integración con Launchpad.net"
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr "Usar Bazaar con Launchpad.net"
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr "Alias para recordar ubicaciones"
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr "Detalles sobre los formatos de acceso disponibles"
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr "Formatos de almacenamiento  experimentales y obsoletos"
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr "Información de la sintaxis de patrones"
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr "Repositorios"
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr "Información básica de los repositorios compartidos."
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr "Explicar cómo se usa --revision"
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr "Áboles autónomos"
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr "Órdenes relacionadas::"
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr "Información sobre lo que es un árbol autónomo"
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr "Opciones estándar"
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr "Las opciones estándar son legales para todas las órdenes."
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr "Opciones que se pueden usar con cualquier orden"
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr "Marcas de estado"
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr "   xxx   <nombre de archivo>"
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr "donde los significados de las columnas son los siguientes"
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr "Columna 2 - contenidos::"
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr "Ayuda sobre marcas de estado"
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr "Ramas sin sincronización"
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr "Lista de temas"
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr "Protocolos de transporte permitidos"
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr "Árboles de trabajo"
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr "Órdenes útiles::"
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr "Información en árboles de trabajo"
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+"Configuración de la autenticación\n"
+"==========================="
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+"\n"
+"Intento\n"
+"-----------"
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+"El intento es hacer este archivo tan pequeño como sea posible para minimizar "
+"el mantenimiento."
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr "en vez de usar::"
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr "simplemente use::"
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr "  bzr branch ftp://host.com/path/to/my/branch"
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+"  [misproyectos]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=juan\n"
+"  password=secreta\n"
+"  "
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+"Definiciones de autenticación\n"
+"--------------------------"
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr "1. usuario y contraseña"
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr "2. usuario, reino y contraseña"
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr " 1. la primera coincidencia gana,"
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr " 2. los campos vacíos coinciden siempre,"
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+" 3. «scheme» coincide incluso si los decoradores se han usado en el URL "
+"solicitado,"
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+"Formato de archivo\n"
+"------------------"
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr "Cada sección describe una definición de autenticación."
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr "Cada sección debe definir:"
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr "* «user»: el acceso a usar,"
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr "Cada sección puede definir:"
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr "* «host»: el servidor remoto,"
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr "* «port»: el puerto en el que escucha el servidor,"
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr "* «path»: la ubicación de la rama,"
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr "* «password»: la contraseña."
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+"\n"
+"Ejemplos\n"
+"--------"
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+"        # Proyecto de mascotas para hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jaime\n"
+"        password=obvia1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=juan\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Nuestro usuario local es barbaz, en todos los sitios remotos se "
+"conoce como foobar\n"
+"        user=foobar"
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"\n"
+"Proveedor del albergue de origen\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+"En el dominio shp.net (ficticio) cada proyecto tiene su propio sitio::"
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"HTTPS, servidores SFTP y su  proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+"\n"
+"Mejoras planificadas\n"
+"--------------------"
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr "* añadri un campo «verify_certificates» para «HTTPS»."
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr "Configuración del seguimiento de errores"
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr "    bzr commit --fixes <tracker>:<id>"
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr "o::"
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr "    bzr commit --fixes <id>"
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+"  ============================ ============ ============\n"
+"  URL                          Ejemplo de abreviatura\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+"Launchpad\n"
+"---------"
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+"Use «bzr commit --fixes lp:2»» para grabar que esta ejecución arregla el "
+"error 2."
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr "    bugzilla_squid_url = http://bugs.squid-cache.org"
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+"trac_<tracker>_url\n"
+"------------------"
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+"Configuración\n"
+"============="
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+"Configuración de entrono\n"
+"---------------------"
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr "  \"Juan Dado <jdado@ejemplo.com>\""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr "Vea también las opciones de configuración de «email»"
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+"BZR_HOME\n"
+"~~~~~~~~"
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr "Sobrescribe el directorio de inicio usado por Bazaar."
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+"BZR_SSH\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr "Seleccione una implementación SSH diferente."
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+"BZR_PDB\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr "Controla si lanzar un depurador para el error."
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+"* 0 = Comportamiento estándar\n"
+"* 1 = Lanzar depurador"
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+"BZR_LOG\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr "* el directorio bzrlib (contiene los complementos «core»),"
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+"* «-user», «-core», «-site» eliminarán las correspondientes\n"
+"  rutas de los valores predeterminados,"
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+"Sobrescribiendo el directorio de complemento de usuario predeterminado::"
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr "  BZR_PLUGIN_PATH='/ruta/a/mis/otros/complementos'"
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr "  BZR_PLUGIN_PATH='-user:-core:-site'"
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr "Sobrescribe el directorio de complemento de sitio predeterminado::"
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr "  BZR_PLUGIN_PATH='/ruta/a/mi/sitiode/complementos:-sitio':+usuario"
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr "Desactivar «myplugin» y «yourplugin» se consigue::"
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+"Ejemplo:\n"
+"~~~~~~~~"
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+"BZRPATH\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+"  http_proxy=http://proxy.ejemplo.com:3128/ \n"
+"  https_proxy=http://proxy.ejemplo.com:3128/"
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+"\n"
+"Archivos de configuración\n"
+"-------------------------"
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+"Ubicación\n"
+"~~~~~~~~"
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr "Hay tres archivos de configuración primarios en esta ubicación:"
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+"* «bazaar.conf» describe las opciones de configuración predeterminadas,"
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+"* «locations.conf» describe información de configuración para\n"
+"  ubicaciones de rama específicas,"
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+"* «authentication.conf» describe información de credencial para\n"
+"  servidores remotos."
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+"Formato general\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+"Commentarios\n"
+"^^^^^^^^^^^^"
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+"Cabeceras de sección\n"
+"^^^^^^^^^^^^^^^^^^^^"
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr "    [PREDETERMINADO]"
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+"    [http://misramas.isp.com/~jdado/dirrama]\n"
+"    [/home/jdado/ramas/]"
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+"    email            = Juan Dado <jdado@isp.com>\n"
+"    gpg_signing_key  = Ana Pons <ana@ejemplo.com>"
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+"  [/top/ubicacón]\n"
+"  push_location = sftp://ejemplo.com/ubicaciñon\n"
+"  push_location:policy = appendpath"
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"\n"
+"El archivo de configuración principal, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+"    [DEFAULT]\n"
+"    email             = Juan Dado <jdado@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"\n"
+"El archivo de ubicación de la rama, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+"    [/home/jdado/ramas/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"El archivo de configuración de la autenticación, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr "    debug_flags = hpss"
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr "    debug_flags = hpss,evil"
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+"correo\n"
+"~~~~~"
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+"editor\n"
+"~~~~~~"
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+"log_format\n"
+"~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+"when-required\n"
+"    Reservada para uso futuro."
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+"never\n"
+"    Reservada para uso futuro."
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+"recurse\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr "    gpg_signing_command = /usr/bin/gnpg"
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+"La orden especificada puede aceptar las opciones «--clearsign» y «-u "
+"<correo>»."
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+"mail_client\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr "Valores permitidos para clientes específicos:"
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr "Los valores genéricos permitidos son:"
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr "valores válidos:"
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+"\n"
+"Opciones Unicode\n"
+"---------------"
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+"\n"
+"Opciones específicas del tipo de rama\n"
+"-----------------------------------------------------------"
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+"push_strict\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+"bound\n"
+"~~~~~"
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+"send_strict\n"
+"~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+"Herramientas de fusión externas\n"
+"----------------------------------------------------"
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"bzr.mergetool.<nombre>\n"
+"~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr "  bzr.mergetool.kdiff3 = kdiff3 {base} {este} {otro} -o {resultado}"
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr "  bzr.default_mergetool = kdiff3\n"
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+"Tipos de conflicto\n"
+"=================="
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr "   «bzr resolve ARCHIVO»"
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr "Vea «bzr help resolve» para tener más detalles."
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+"Conflictos de texto\n"
+"------------------------------"
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr "Mensaje típico::"
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr "  Conflictos de texto en ARCHIVO"
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr "La resolución correcta debería ser «Martin Pool released Bazaar.»"
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+"Conflictos de contenido\n"
+"-------------------------------------"
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr "  Conflictos de contenido en ARCHIVO"
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr "«bzr resolve» reconoce las siguientes acciones:"
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+"Bazaar no puede detectar automáticamente cuando se han resuelto conflictos "
+"de esta clase."
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+"Conflicto de etiquetas\n"
+"-----------------------------------"
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+"Rutas duplicadas\n"
+"--------------------------"
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+"Padre sin versión\n"
+"--------------------------"
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+"Falta el padre\n"
+"---------------------"
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+"Eliminando padre\n"
+"---------------------------"
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr "Hay dos posibles valores para esta opción:"
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+"Conflicto de ruta\n"
+"--------------------------"
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr "Generalizando, hay dos formatos de contenido permitidos por Bazaar:"
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+"\n"
+"Conversión de formato\n"
+"------------------------------------"
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+"\n"
+"Activar filtros de contenido\n"
+"--------------------------------------------"
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+"\n"
+"Impacto en las órdenes\n"
+"------------------------------------"
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+"\n"
+"Actualizar su árbol de trabajo\n"
+"----------------------------------------------"
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr "Aquí hay algunas directrices para hacer esto:"
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr "Formatos de almacenamiento actual"
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+"Marcas de depuración\n"
+"================="
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+"Ramas con divergencia\n"
+"=================="
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+"Una solución\n"
+"------------"
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+"Conversión de fin de línea\n"
+"====================="
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+"\n"
+"Ganchos\n"
+"======="
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+"Introducción\n"
+"------------"
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+"\n"
+"BranchHooks\n"
+"-----------"
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr "Introducido en: 2.2"
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+"open\n"
+"~~~~"
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr "Introducido en: 1.8"
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr "Introducido en: 1.4"
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+"post_commit\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr "Introducido en: 0.15"
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+"post_pull\n"
+"~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+"post_push\n"
+"~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+"post_switch\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr "Introducido en: 1.6"
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+"pre_commit\n"
+"~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr "Introducido en: 0.91"
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+"set_rh\n"
+"~~~~~~"
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr "Introducido en: 1.9"
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+"CommandHooks\n"
+"------------"
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr "Introducido en: 1.13"
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+"get_command\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr "Introducido en: 1.17"
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+"_ConfigHooks\n"
+"------------"
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+"get\n"
+"~~~"
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr "Introducido en: 2.4"
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+"load\n"
+"~~~~"
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+"remove\n"
+"~~~~~~"
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+"save\n"
+"~~~~"
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+"set\n"
+"~~~"
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+"pre_open\n"
+"~~~~~~~~"
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr "Introducido en: 1.14"
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+"InfoHooks\n"
+"---------"
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+"repository\n"
+"~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr "Introducido en: 1.15"
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+"LockHooks\n"
+"---------"
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+"MergeHooks\n"
+"----------"
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr "Introducido en: 2.1"
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+"MergeDirectiveHooks\n"
+"-------------------"
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr "Introducido en: 1.15.0"
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+"MessageEditorHooks\n"
+"------------------"
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr "Introducido en: 1.10"
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+"MutableTreeHooks\n"
+"----------------"
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr "Introducido en: 2.0"
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+"SmartClientHooks\n"
+"----------------"
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+"call\n"
+"~~~~"
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+"SmartServerHooks\n"
+"----------------"
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+"StatusHooks\n"
+"-----------"
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+"post_status\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+"pre_status\n"
+"~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+"revisión\n"
+"~~~~~~~~"
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+"Alias de ubicación\n"
+"=============="
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr "Los alias son::"
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr "Por ejemplo para impulsar la ubicación padre::"
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+"Formatos de registro\n"
+"================"
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr "Otros formatos de almacenamiento"
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+"Patrones\n"
+"========"
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr "Los patrones pueden incluir comodines globales tales como::"
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr "Identificadores de revisión"
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+"Las palabras claves usadas como métodos de selección de revisión son las "
+"siguientes:"
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr "Además, los complementos pueden proporcionar otras palabras clave."
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+"A continuación se proporciona una detallada descripción de cada palabra "
+"clave."
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ":revid:"
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+"      revid:aaaa@bbbb-123456789 -> Selecciona la revisión «aaaa@bbbb-"
+"123456789»"
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ":submit:"
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr "    Ejemplos::"
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr "      $ bzr diff -r submit:"
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ":ancestor:"
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ":date:"
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ":branch:"
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+"    Suministra la ruta a una rama para seleccionar su última revisión."
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr "      branch:/ruta/a/rama"
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ":tag:"
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ":revno:"
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ":before:"
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ":annotate:"
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ":mainline:"
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ":last:"
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+"      last:1        -> devuelve la última revisión\n"
+"      last:3        -> devuelve la revisión 2 antes del final.\n"
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+"Reglas\n"
+"======"
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+"Archivos\n"
+"--------"
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+"Patrones de regla\n"
+"----------------------------"
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ".. nota::"
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr " * Rutas de sistemas de archivo, relativas o absolutas"
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr "Estas son válidas pero no se refieren al mismo archivo::"
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+"  bzr log file:///tmp/%2Falso (se refiere al archivo llamado /tmp/\\/also)\n"
+"  bzr log %252Falso (se refiere al archivo llamado /tmp/%252Falso)"
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr "Identificadores  de URL"
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr "Prefijos de URL permitidos:"
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr "Modificadores permitidos:"
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr "Bazaar permite todas las partes estándar con el URL::"
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr "  <protocolo>://[usuario[:contraseña]@]anfitrión[:puerto]/[ruta]"
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr "permitir URL tales como:"
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr "re refieren a «/home/remote/myproject/trunk»."
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
+"Muchas órdenes que aceptan URL también aceptan alias de ubicaciones.\n"
+"Vea :doc:`location-alias-help` y :doc:`url-special-chars-help`.\n"
diff --git a/po/fo.po b/po/fo.po
new file mode 100644
index 0000000..d7766a2
--- /dev/null
+++ b/po/fo.po
@@ -0,0 +1,13237 @@
+# Faroese translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Faroese <fo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:19+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..69f4178
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,13259 @@
+# French translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:19+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr "Dépilement"
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr "Publication jusqu'à la révision %d."
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] "%d étiquette mise à jour."
+msgstr[1] "%d étiquettes mises à jour."
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr "Pas de nouvelles révisions ou étiquettes à publier."
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr "Aucune nouvelle révision à envoyer."
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "erreur trouvée : %s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"Ceci informe sur les fichiers versionnés et inconnus, regroupés\n"
+"selon leur état. Les différents états sont :"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+"ajouté\n"
+"    Versionné dans la copie de travail mais pas dans la révision précédente."
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+"retiré\n"
+"    Versionné dans la révision précédente mais enlevé ou supprimé\n"
+"    de la copie de travail."
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+"renommé\n"
+"    l'emplacement de ce fichier a changé depuis la révision précédente ;\n"
+"    le texte peut également avoir été modifié. Ceci inclut les fichiers "
+"dont\n"
+"    le répertoire parent a été renommé."
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+"modifié\n"
+"    Le texte a été modifié depuis la révision précédente."
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+"type modifié\n"
+"    le type du fichier a été modifiée (ex. de fichier à répertoire)."
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+"inconnu\n"
+"    Non versionné et ne correspond pas à une règle d'exclusion."
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+"Pour voir la liste des fichiers ignorés, utilisez « bzr ignored ».\n"
+"Pour le détail des modifications sur les fichiers textes,\n"
+"utilisez « bzr diff »."
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+"bzr status --revision prend exactement un ou deux numéros de révision"
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr "Le répertoire {0} ne contient aucune révision {1}."
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr "Afficher le numéro de la révision actuelle."
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr "ajouté %s\n"
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr "Déplacer ou renommer un fichier."
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/gl.po b/po/gl.po
new file mode 100644
index 0000000..d217d3b
--- /dev/null
+++ b/po/gl.po
@@ -0,0 +1,13258 @@
+# Galician translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:19+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr "Non hai revisións ou etiquetas para empurar (push)."
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr "Non hai revisións novas para empurrar (push)."
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "atopouse un erro: %s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr "Ignorando os ficheiros fóra da vista. A vista é %s"
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr "bzr %s --revision toma exactamente un identificador de revisión"
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr "Mostrar o resumo do estado."
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"Isto informa sobre ficheiros versionados e descoñecidos, informando\n"
+"deles agrupados por estado. Os estados posíbeis son:"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+"engadido\n"
+"    Versionado na copia de traballo pero non na revisión anterior."
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+"eliminado\n"
+"    Versionado na revisión anterior pero quitado ou eliminado\n"
+"    na copia de traballo."
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+"renomeado\n"
+"    A ruta a este ficheiro cambiou desde a revisión anterior;\n"
+"    o texto semella que cambiou. Isto inclúe os ficheiros cuxo\n"
+"    cartafol pai foi renomeado."
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+"modificado\n"
+"    O texto cambiou desde a última revisión."
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+"semella cambiado\n"
+"    O ficheiro semella que foi cambiado (p.ex. de ficheiro a cartafol)"
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+"descoñecido\n"
+"    Non versionado e non coincide cun patrón de ignorado."
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+"Para ver os ficheiros use «bzr ignored». Para máis información\n"
+"sobre os cambios nos textos dos ficheiros use «bzr diff»."
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+"Para comparar o cartafol de traballo con unha revisión específica, pase\n"
+"unha revisión ao argumento «revision»."
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr "Usar os indicadores de estado curtos"
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr "Mostrar só os ficheiros versionados."
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr "Non mostrar as combinacións (merge) pendentes"
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr "Debe fornecer ou --revision ou un id_de_revision"
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr "Non pode eliminar o cartafol de traballo desde unha ruta remota"
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/he.po b/po/he.po
new file mode 100644
index 0000000..0acce5c
--- /dev/null
+++ b/po/he.po
@@ -0,0 +1,13237 @@
+# Hebrew translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-03-05 14:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-03-06 05:15+0000\n"
+"X-Generator: Launchpad (build 14900)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 0000000..114500f
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,13237 @@
+# Italian translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:19+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 0000000..4a18784
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,13837 @@
+# Japanese translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:20+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr "{0} をスキップ ({1} の {2} byte より大きいため)"
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr "スタックの解除"
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr "リビジョン%dまでプッシュしました。"
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] "%d 個のタグを更新しました"
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr "プッシュする新しいリビジョンやタグはありません。"
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr "プッシュする新しいリビジョンはありません。"
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr "format {1} のブランチ {0} をチェックしました"
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "検出されたエラー: %s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr "ビューに含まれないファイルは無視します。ビュー：%s"
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr "bzr %s --revision には、リビジョンＩＤを一つだけ指定します。"
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr "ステータスのサマリーを表示します。"
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"このコマンドは、バージョン管理されたファイルやバージョン管理外ファイル\n"
+"について、ステータスごとにグルーピングして表示します。\n"
+"表示されるステータスは以下の通りです。:"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+"added\n"
+"    作業コピー内ではバージョン管理されているが、一つ前のリビジョンでは管理\n"
+"    されていない。"
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+"removed\n"
+"    一つ前のリビジョンでは管理されているが、作業コピー内では削除されている。"
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+"renamed\n"
+"    このファイルのパスは一つ前のリビジョンから変更されている。\n"
+"    内容も変更されている可能性がある。親ディレクトリが変更されたファイルも\n"
+"    含む。"
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+"modified\n"
+"    ファイルの内容が一つ前のリビジョンから変更されている。"
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+"kind changed\n"
+"    ファイルの種別が変更されている。(ファイルからディレクトリに変わったなど)"
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+"unknown\n"
+"    バージョン管理されておらず、無視パターンにも一致していない。"
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+"さらにディレクトリ、シンボリックリンク、実行可能ファイルについては、\n"
+"末尾に種別を現す文字としてそれぞれ'/'、'@'、'*'が付加されます。\n"
+"これを表示しないようにするには、'--no-classify'オプションを指定してください。"
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+"無視ファイルを見るには'bzr ignored'を使ってください。\n"
+"ファイルの内容の変更を詳しく見るには、'bzr diff'を使ってください。"
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+"--shortまたは-Sを指定した場合、Subversionのstatusコマンドと同じように\n"
+"すべてのアイテムにマーカーが表示されることに注意してください。\n"
+"SVNで-qを指定した場合と同じような形式にするには、bzr status -SV を\n"
+"使用してください。"
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+"何も引数を指定しない場合、作業コピー全体のステータスが表示されます。\n"
+"指定した場合は、指定のファイルやディレクトリのステータスだけが表示\n"
+"されます。ディレクトリを指定した場合は、そのディレクトリの配下の全ての\n"
+"ファイルのステータスが表示されます。"
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+"マージがコミットされる前には、マージ中のTipリビジョンが表示されます。\n"
+"すべてのマージ中リビジョンを表示するには、-vオプションを使用します。\n"
+"マージ中の情報を省略するには、no-pendingオプションを使用するか、\n"
+"ファイルやディレクトリを指定してください。"
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+"作業フォルダと指定リビジョンとを比較するには、リビジョンを一つだけ\n"
+"引数に指定してください。"
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+"指定されたリビジョンで、もしくは指定された２つのリビジョン間でどのファイルが\n"
+"変更されたかを見るには、２つのリビジョンを引数に指定してください。\n"
+"'bzr diff --summarize' でも見ることができます。"
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr "省略形式でステータスを表示します。"
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr "バージョン管理されているファイルだけを表示します。"
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr "マージ中の情報を表示しません。"
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr "オブジェクトの種別を表すマーカーを表示しません。"
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr "bzr status --revisionには、１つか２つのリビジョンを指定します。"
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr "リビジョンＩＤと--revisionのどちらか一つだけを指定してください。"
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr "--revisionとリビジョンＩＤのどちらかを指定してください。"
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr "リポジトリ %r はリビジョンのtextへの直接アクセスをサポートしていません"
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr "リポジトリ {0} にはリビジョン {1} はありません。"
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr "NULLリビジョンは指定できません。"
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr "指定されたブランチ/チェックアウトから作業ツリーを削除します。"
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+"軽量チェックアウトは作業ツリーよりも小さいため、軽量チェック\n"
+"アウトに対して実行することはできません。"
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr "作業ツリーを再作成するには、 \"bzr checkout\" をしてください。"
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr "作業ツリーが変更されていたり、シェルフされた変更があっても、作業ツリーを削除します。"
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr "削除する作業ツリーがありません。"
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr "リモートの作業ツリーを削除することはできません。"
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr "軽量チェックアウトから作業ツリーを削除することはできません。"
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+"ツリーは壊れていないようです。代わりに\"bzr revert\"を実行してください。もし、本当に作業ツリーをリセットしたいのであれば、\"--"
+"force\"オプションを指定してください。"
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ", ヘッダーが壊れているようです。-r -1を指定して最終コミット時点の状態に戻してください。"
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr "ツリーの状態をリセットできませんでした。{0}"
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr "現在のリビジョン番号を表示します。"
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr "これは、ブランチ内のリビジョンの数と同じです。"
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr "--tree と --revision は同時に指定できません"
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr "タグは1つのリビジョンにしか指定できません"
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr "作業ツリーのリビジョン番号を表示します。"
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr "指定されたファイルやディレクトリを追加します。"
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+"non-recursiveモードの場合、無視されていたものも含めて指定されたすべての\n"
+"アイテムが追加されます。指定されたファイルが既に追加されているものだった\n"
+"場合は、警告が表示されます。"
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+"recursiveモード(デフォルト)の場合は、ファイルの扱いは同じですが、\n"
+"ディレクトリの扱いは変わります。既に追加されているディレクトリを指定\n"
+"しても警告にはなりません。バージョン管理されているかどうかにかかわらず、\n"
+"指定されたすべてのディレクトリ内のファイル、サブディレクトリをチェックして、\n"
+"バージョン管理対象外でかつ無視されていないものを追加します。\n"
+"この処理は、バージョン管理されたディレクトリに対して再帰的に実行されます。\n"
+"何も指定されていない場合は、'.'が指定されたものとみなします。"
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr "ネストしたツリーがあった場合、明示的に無視しない限り警告を表示します。"
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+"つまり、単に 'bzr add' とした場合は、すべての不明なファイルがバージョン\n"
+"管理に追加されます。"
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+"親ディレクトリがバージョン管理外のファイルを追加しようとした場合、自動的に\n"
+"親ディレクトリや、そのさらに上位のディレクトリも追加されます。つまり、\n"
+"ディレクトリを明示的に追加する必要はなく、その中にあるファイルを追加すれば\n"
+"ディレクトリも追加されるということになります。"
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+"--dry-run を指定すると、どのファイルが追加されるかを表示しますが、実際に追加は\n"
+"しません。"
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+"--file-ids-fromを指定すると、指定されたパスから得たファイルIDを使おうと\n"
+"します。対応する親ディレクトリ内の同じ名前のファイルからファイルIDを探し、\n"
+"無ければ純粋なパスから生成します。このオプションが必要になることはほとんど\n"
+"ありませんが、同じファイルを、いずれマージする予定の２つのブランチに追加する\n"
+"場合に便利です(マージの時の衝突を避けられます)。また、別のプロジェクトをサブ\n"
+"ディレクトリとしてマージする時にも便利です。"
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+"無視パターンにマッチするファイルは、明示的に指定されない限り追加は\n"
+"されません。"
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+"recursiveモードの場合、add.maximum_file_sizeの設定値より大きな\n"
+"ファイルは追加されません。明示的に指定されたアイテムはファイルサイズに\n"
+"かかわらず追加されます。"
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr "ディレクトリの内容を再帰的に追加しません。"
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr "このツリーからファイルIDを検索します。"
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr "無視 {0} (\"{1}\"にマッチ)\n"
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr "バージョン管理されたディレクトリを作成します。"
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr "ディレクトリを作成して、バージョン管理に追加することと同じです。"
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr "%s が追加されました。\n"
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr "kindが正しくありません。 %s"
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr "ファイルの移動や名前の変更を行います。"
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr "    bzr mv SOURCE... DESTINATION"
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+"最後の引数がバージョン管理対象ディレクトリの場合、指定された他の項目は\n"
+"すべてそのディレクトリの中に移動されます。そうでない場合は、引数の数は\n"
+"２つでなければならず、ファイルは新しい名前に変更されます。"
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+"OLDNAMEがファイルシステム上に存在せず、かつバージョン管理対象に\n"
+"なっていて、NEWNAMEはファイルシステム上に存在しているがバージョン\n"
+"管理対象にはなっていない場合は、ファイルは既に手動で移動済みだとみなし、\n"
+"内部データへの変更の反映だけを行います。\n"
+"複数のSOURCEをひとつのDESTINATIONに移動する場合も同じです。"
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr "ファイルを別のブランチに移動することはできません。"
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr "ファイルは既に移動済みのため、ファイルのBazaar IDだけを移動します。"
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr "変名を自動的に推測します。"
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr "変名を推測する時に、実際には変更を行いません。"
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr "--dry-runは--autoとともに指定してください。"
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr "ファイルが指定されていません。"
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr "ブランチの root は移動できません。"
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr "--autoを指定する場合はパスはひとつだけ指定してください。"
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr "--afterと--autoを同時に指定することはできません。"
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr "複数のファイルを移動する時は、移動先はバージョン管理されていなければなりません。"
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr "このブランチを別のブランチのミラーにします。"
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+"デフォルトでは、このコマンドは分岐していないブランチでのみ実行できます。\n"
+"対象のブランチの最新コミットがまだ(直接的または間接的に)親ブランチにマージ\n"
+"されていなければ、ブランチが分岐しているとみなします。"
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+"ブランチが分岐している場合、その変更を片方からもう片方に統合するために\n"
+"'bzr merge'を使用することができます。ブランチをマージすれば、またpullできる\n"
+"ようになるはずです。"
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+"もし、リモートの変更内容で手元での変更内容を単純に置き換えたい場合は、\n"
+"pull --overwriteを使用してください。これは、ブランチ同士が分岐していても\n"
+"実行できます。"
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+"デフォルトのpull対象ブランチが設定されていない場合は、最初にpullした時に\n"
+"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
+"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
+"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモート\n"
+"ブランチにアクセスできた時だけ保存されます。"
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+"--verbose オプションは pull されたリビジョンを log_format 設定オプションを\n"
+"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"
+"別のフォーマットで表示できます。"
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+"ブランチだけでなく、bzr sendで生成されたマージディレクティブを含むファイル\n"
+"もpull対象として指定できることに注意してください。"
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr "pull対象リビジョンのログを表示します。"
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr "作業フォルダの代わりにpullを受け入れるブランチ"
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr "バインドブランチに対してpullする場合に、マスターブランチには反映しないようにします。"
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr "--show-baseオプションを使用するには作業ツリーが必要です。"
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr "pull対象ブランチが指定されていません。"
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr "デフォルトの親ブランチを使用します。: %s\n"
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr "マージディレクティブやバンドルに対して-rを使用することはできません。"
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr "このブランチのミラーを更新します。"
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+"対象のブランチの作業ツリーの更新はコストが高く、リモートファイルシステムでは\n"
+"サポートされていないため、作業ツリーの更新は行いません。"
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+"将来的に、作業ツリーの更新ができるようなスマートサーバやプロトコルがリリース\n"
+"*かもしれません*。"
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+"このコマンドは、分岐していないブランチ同士でのみ使用できます。push先ブランチ\n"
+"の最新のコミットが(直接的、もしくは間接的に)push元のブランチにまだマージされて\n"
+"いない状態の場合に、ブランチが分岐しているとみなされます。"
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+"ブランチ同士が分岐している場合、 'bzr push --overwrite' で、まだマージされて\n"
+"いない変更を破棄してpush先のブランチを完全に置きかえることができます。"
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+"push先のブランチに違う変更があって、それを残したいなら、まずpush先のブランチ\n"
+"からマージして(bzr help mergeを参照)コミットしてください。そうすれば、\n"
+"'--overwrite'の指定なしでpushできるようになります。"
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+"デフォルトのpush対象ブランチが設定されていない場合は、最初にpushした時に\n"
+"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
+"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
+"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
+"ブランチにアクセスできた時だけ保存されます。"
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+"--verbose オプションは push されたリビジョンを log_format 設定オプションを\n"
+"利用して表示します。 -Olog_format=<other_format> と指定することで、\n"
+"別のフォーマットで表示できます。"
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr "カレントディレクトリの代わりにpush元とするブランチを指定します。"
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+"デフォルトでは、push先のディレクトリが既に存在しているのにバージョン管理されていない状態の場合はpushできません。このフラグを指定すると、その場合で"
+"もpushできるようになります。"
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr "親ブランチの公開された場所を参照するスタックドブランチを作成します。"
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr "コミットの履歴を別のブランチから参照するスタックドブランチを作成します。参照先のブランチにない変更だけがこのブランチに含まれます。"
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+"作業コピーが変更されている場合はpushできませんが、--no-strictオプションを指定\n"
+"するとpushできるようになります。"
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr "作業コピーを更新できるプロトコルを使っている場合でも、更新しません。"
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr "参照先のブランチを特定できません。"
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr "push先が設定も指定もされていません。親ブランチ(%s)にpushする場合は、'bzr push :parent'を使用してください。"
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr "push先のブランチが設定も指定もされていません。"
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr "デフォルトのpush先ブランチを使用します。: %s"
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr "既存のブランチをコピーして新しいブランチを作成します。"
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+"TO_LOCATIONが指定されていない場合は、FROM_LOCATIONの最後のパーツが使われます。\n"
+"つまり、\"branch ../foo/bar\"とした場合は、./barが作られます。\n"
+"FROM_LOCATIONに、スラッシュやその環境のパスセパレータが含まれていない場合は\n"
+"FROM_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"
+"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+"ブランチの特定のリビジョンで取り出したい場合は、\"branch foo/bar -r 5\"の\n"
+"ように--revisionオプションを指定してください。"
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr "このコマンドの別名である'clone'と'get'は廃止予定です。"
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr "作業ツリーのないブランチを作成します。"
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr "カレントディレクトリにあるチェックアウトの参照先を新しいブランチに切り替えます。"
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr "元のブランチを参照するスタックドブランチを作成します。新しいブランチでは、元のブランチにアクセスできるときしか操作できません。"
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr "共有リポジトリが使える場合でも、共有リポジトリを使いません。"
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+"デフォルトでは、branch先のディレクトリが既に存在しているのにバージョン管理されていない場合はbranchできません。このフラグを指定すると、その場合"
+"でもbranchできるようになります。"
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr "新しいブランチを元のブランチにバインドします。"
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr "対象のディレクトリ \"%s\" は既に存在します。"
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr "\"%s\" の親が見つかりません。"
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr "ブランチ {0} にリビジョン {1} はありません。"
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr "%s を参照するスタックドブランチを作成しました。"
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] "%d個のリビジョンをブランチしました。"
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr "新しいブランチは %s にバインドされています。"
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr "バインド先をスイッチしました。: %s"
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr "カレントフォルダにある利用可能なブランチをリストアップします。"
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr "このコマンドは、現在の場所にある全てのブランチの名前を表示します。"
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr "指定された場所だけでなく、再帰的にブランチを探します。"
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr "(デフォルト)"
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr "既存のブランチのチェックアウトを新しく作成します。"
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+"BLANCH_LOCATIONが指定されていない場合は、'.'にあるブランチを再構成します。\n"
+"これは、作業ツリーを消してしまった場合や、そもそも作業ツリーが作成されて\n"
+"いない場合(例えば、SFTPでpushされたブランチなど)に役立ちます。"
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+"TO_LOCATIONが指定されていない場合は、BRANCH_LOCATIONの最後のパーツが使われ\n"
+"ます。つまり、\"checkout ../foo/bar\"とした場合は、.barが作られます。\n"
+"BRANCH_LOCATIONに、スラッシュやその環境のパスセパレータが含まれていない場合は\n"
+"BRANCH_LOCATIONからスキーマやドライブのIDを取り除いたものがTO_LOCATIONになり\n"
+"ます。例えば、\"branch lp:foo-bar\"とすると、./foo-barが作られます。"
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+"ブランチの特定のリビジョンで取り出したい場合は、\"checkout foo/bar -r 5\"の\n"
+"ように--revisionオプションを指定してください。その場合は作業コピーが古い状態に\n"
+"なるため、コミットはできませんが、例えば古いコードをチェックする場合などに\n"
+"役立ちます。"
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+"軽量チェックアウトを作成します。軽量チェックアウト上での操作には、チェック\n"
+"アウト元のブランチにアクセスできる必要があります。通常のチェックアウトの\n"
+"場合は、diffやstatusのような一般的な操作ではその必要はありませんし、ローカル\n"
+"コミットすることもできます。"
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr "ファイルの内容をこのツリーから取得します。"
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr "可能なら、作業コピーをハードリンクします。"
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+"変名されたファイルをリストアップします。\n"
+"    "
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr "作業ツリーを新しいリビジョンに更新します。"
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+"移動先のリビジョン(ブランチのTipもしくは指定されたリビジョン)を作業ツリーに\n"
+"マージして、そのリビジョンを作業ツリーのベースリビジョンに設定します。  "
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+"古いリビジョンに一時的に移動したり、ブランチより古くなってしまった作業ツリーを\n"
+"最新の状態にしたりすることができます。"
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+"作業ツリーにコミットされていない変更があった場合、その変更は update 後も\n"
+"コミットされていない変更として残ります。これらの変更を取り消すには、\n"
+"'bzr revert' コマンドを利用してください。コミットされていない変更は、ベース\n"
+"リビジョンの更新による変更とコンフリクトする可能性があります。"
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+"作業ツリーのブランチがマスターブランチに束縛されている場合、bzrは\n"
+"作業ツリーのブランチもマスターブランチの状態に更新します。"
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+"Bazaarの作業ツリーはそれぞれベースリビジョンをひとつだけ持っているので、\n"
+"ファイルやディレクトリを個別に更新することはできません。もし、手元で削除して\n"
+"しまったファイルを元に戻したいのであれば、'bzr update'ではなく'bzr revert'を\n"
+"使ってください。もし、ファイルを前のバージョンの状態に戻したいのであれば、\n"
+"'bzr revert'に -r オプションを指定するか、'bzr cat'を使って古い内容を書き出して\n"
+"ください。"
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+"dir 引数を指定する場合は、作業ツリーのルートを指定する必要があります。\n"
+"デフォルトでは、カレントディレクトリを含む作業ツリーが選択されます。"
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr "bzr update --revisionには、リビジョンをひとつだけ指定します。"
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr "bzr updateは、個々のファイルやディレクトリではなく、作業ツリー全体を更新します。"
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr "ツリーはブランチ {1} のリビジョン {0} で最新の状態です。"
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+"ブランチには%sというリビジョンはありません。\n"
+"bzr update --revisionには、ブランチ内のリビジョンを指定する必要があります。"
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr "ブランチ {1} のリビジョン {0} に更新されました。"
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr "ローカルで行った変更は、'bzr status'ではマージ中状態になっており、'bzr commit'でコミットできます。"
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr "作業コピー、ブランチ、リポジトリの情報を表示します。"
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+"このコマンドは、ツリー、ブランチ、リポジトリに関連する所在やフォーマット\n"
+"のすべての情報を表示します。"
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+"verboseモードでは、それぞれのレポートに統計情報が追加されます。さらに\n"
+"高度な統計情報を見るには、-vvのようにverboseオプションを複数回指定する\n"
+"ことによって、verboseレベル2以上を指定してください。"
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr "ブランチと作業ツリーについては、存在しないリビジョンについても表示されます。"
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ":例:"
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr "  フォーマットと関連する場所についての情報を表示します。"
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr "    bzr info"
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+"  より詳細なフォーマット情報と、基本的な統計情報(作業ツリー内のファイルの\n"
+"  数、ブランチ、リポジトリ内のリビジョンの数など)を一緒に表示します。:"
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr "    bzr info -v"
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr "  さらに、このブランチにコミットした人の数も表示します。:"
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr "    bzr info -vv"
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr "ファイルやディレクトリを削除します。"
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+"このコマンドで指定されたファイルの変更をBazaarは管理しなくなります。\n"
+"revertでファイルが簡単に復活できる場合は、ファイルは削除されますし、そうで\n"
+"ない場合はバックアップ(.~#~という形式の拡張子がつきます)されます。オプション\n"
+"やパラメータが指定されていない場合は、バージョン管理されているけれどツリー\n"
+"削除されているファイルを探して、そのファイルのバージョン管理を止めます。"
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr "まだコミットされていないファイルだけを削除します。"
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr "使用するファイル削除モードです。"
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr "削除モード"
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr "変更したファイルをバックアップします。"
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr "Bazaarからは削除しますが、作業ツリーには残します。"
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr "変更されたファイルをバックアップしません。"
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+"元に戻せないファイル、空ではないディレクトリも含めて、指定されたアイテムを全て削除します。(廃止予定。no-backupを使用してください)"
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr "(--forceオプションは廃止予定です。今後は--no-backupを使用してください)"
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr "対象のファイルはありませんでした。"
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr "ブランチ内のBazaarのメタデータを修復します。"
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+"このコマンドで、オペレーションの失敗やBzrのアップグレードによってできた\n"
+"と思われるデータの不整合を修正することができます。'bzr check'の結果や、\n"
+"Bzrの開発者からの指示があるとき以外は、実行する必要はありません。"
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+"２番目のブランチが指定された場合は、クロスブランチ修復を行います。\n"
+"これは、ツリーのルートIDのような、非常に古いバージョンのBzrにはなかった\n"
+"データが、両方のブランチに正しく表現されているかをチェックします。"
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+"同時に、ディスクスペースの節約やパフォーマンスの向上のために、データの\n"
+"再圧縮がかかる可能性があります。"
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+"ブランチは、ローカルディスクやsftpのような、リスト可能なシステム上に\n"
+"ある*必要があります*。"
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+"bzr 2.0 シリーズのためのフォーマット。\n"
+"group-compress ストレージを利用します。\n"
+"rich root 機能を提供します。 rich root 機能を提供するフォーマットに変換すると、\n"
+"rich root 機能を持たないフォーマットに戻ることはできません。\n"
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr "colocated branch を実験的にサポートする 2a フォーマット。\n"
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr "ディレクトリを、バージョン管理されたブランチにします。"
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+"空のブランチを作る場合や、既存のプロジェクトをインポートする前にこの\n"
+"コマンドを使用します。"
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+"親ディレクトリにリポジトリがある場合は、ブランチ内の履歴はリポジトリに\n"
+"保存されます。そうでない場合は、履歴を.bzrディレクトリ内に持つスタンド\n"
+"アロンブランチが作成されます。"
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+"既にブランチがあって、作業ツリーがない場合は、'bzr checkout'でツリーを\n"
+"生成することができます。"
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr "ファイルのツリーをインポートするためのレシピ::"
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr "ブランチまでのパスが存在していなければ、作成します。"
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr "ブランチのフォーマットを指定します。\"help formats\"をご覧ください。"
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr "リビジョン番号や既存のログを変更せず、リビジョンの追加だけを行います。"
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr "作業ツリーをもたないブランチを作成します。"
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+"%s の親ディレクトリがありません。\n"
+"--create-prefixを指定すれば、親ディレクトリも作成されます。"
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr "このブランチフォーマットにappend-revisions-onlyは指定できません。--defaultを試してください。"
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr "{0}を作成しました。(フォーマット:{1})\n"
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr "共有リポジトリを使用しました。: %s\n"
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr "ブランチのストレージを共有するための共有リポジトリを作成します。"
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+"リポジトリのディレクトリの配下に新しく作られたブランチは、リビジョンを\n"
+"ブランチのディレクトリではなくリポジトリに保存します。リビジョンを共有\n"
+"しているブランチ同士のストレージサイズが節約され、新しいブランチを作成\n"
+"するスピードも速くなります。"
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+"--no-treesオプションが指定された場合は、リポジトリ内に作成されたブランチ\n"
+"にはデフォルトでは作業ツリーができません。ディスク上にディレクトリとしては\n"
+"ありますが、特定リビジョンのファイルのコピーを個々に持つことはありません。\n"
+"これは、サーバー上のリポジトリなど、チェックアウトやリモートブランチとやりとり\n"
+"するリポジトリの場合に役立ちます。"
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+":例:\n"
+"    ブランチだけをもつリポジトリを作成します。::"
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr "    別の場所に軽量チェックアウトを作成します。::"
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (ここでファイルを追加)"
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr "リポジトリのフォーマットを指定します。詳しくは\"bzr help formats\"をご覧ください。"
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr "リポジトリフォーマット"
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr "リポジトリ内のブランチにはデフォルトでは作業ツリーを持たせません。"
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr "作業ツリーや、リビジョン、ブランチ間の差分を表示します。"
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+"引数が指定されなかった場合は、現在のツリーのすべての変更が表示されます。\n"
+"ファイルが指定された場合は、そのファイルの変更だけが表示されます。\n"
+"リモートブランチや、複数のブランチを -oldと-newオプションで指定することが\n"
+"できます。これらが指定されていない場合は最初の引数が使われ、引数が無い\n"
+"場合は作業ツリーが対象になります。"
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+"\"bzr dif -p1\"は、\"bzr diff --prefix old/:new/\" と同じで、\"patch -p1\"に\n"
+"準じたパッチを出力します。"
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+"-rオプションでリビジョンの範囲を指定した場合は、その２つのリビジョン間での\n"
+"差分が取得されることに注意してください。つまり、リビジョンの範囲の開始\n"
+"リビジョンでの変更は含まれません。これは、\"bzr log\"にリビジョンの範囲を\n"
+"指定した場合の動作(開始リビジョンも含む)とは異なります。"
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+":Exit values:\n"
+"    1 - 変更あり\n"
+"    2 - 表示できない変更\n"
+"    3 - エラー\n"
+"    0 - 変更なし"
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+":例:\n"
+"    最新のコミットと作業ツリーとの間の変更を表示します。::"
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr "        bzr diff"
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr "    作業ツリーとリビジョン１を比較します。::"
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr "        bzr diff -r1"
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr "    リビジョン３とリビジョン１を比較します。::"
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr "        bzr diff -r1..3"
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr "    ブランチxxxのリビジョン３とリビジョン１を比較します。::"
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr "        bzr diff -r1..3 xxx"
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr "    リビジョン２での変更です。(-r1..2 と同じです。)::"
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr "        bzr diff -c2"
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+"    リビジョンXでの変更を見るには、::\n"
+"    \n"
+"        bzr diff -cX"
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+"    マージされたリビジョンの場合は、-cオプションは左側の親からの変更を表示する\n"
+"    ことに注意してください。他の親からの変更を見るには、以下のようにします。::"
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr "        bzr diff -r<対象の親リビジョン>..X"
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr "    現在のリビジョンと一つ前のリビジョンとの差分です。(-c-1 、 -r-2..-1 と同じ)"
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr "        bzr diff -r-2.."
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr "    ファイルNEWSの変更だけを表示します。::"
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr "        bzr diff NEWS"
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr "    作業ツリーxxxの、ファイルNEWSの変更内容を表示します。::"
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr "        bzr diff xxx/NEWS"
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr "    ブランチxxxと作業ツリーとの間の差分を表示します。::"
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr "        bzr diff --old xxx"
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr "    ２つのブランチ間での、ファイルNEWSの差分を表示します。::"
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr "        bzr diff --old xxx --new yyy NEWS"
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr "    'bzr diff'と同じですが、プレフィックスold/、new/を付加します。::"
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    カスタムのdiffプログラムにオプションを指定して、差分を表示します。::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr "これらのオプションは外部のdiffプログラムに渡されます。"
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr "古いファイル名と新しいファイル名にプレフィックスを追加します。２つの値をコロンで区切って指定します。(例 \"old/:new/\")"
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr "比較元のブランチ/作業ツリーです。"
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr "比較先のブランチ/作業ツリーです。"
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr "ファイル比較に使うコマンドです。"
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr "使用するDiffフォーマットです。"
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr "Diffフォーマット"
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr "--prefix は２つの値をコロンで区切ったものにしてください。 (例 \"old/:new/\")"
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr "bzr diff --revision には１つまたは２つのリビジョンを指定してください。"
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr "{0} と {1} を同時に指定することはできません。"
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+"作業ツリー上で削除されたファイルをリストアップします。\n"
+"    "
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr "ツリーのルートディレクトリを表示します。"
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr "ルートとは、.bzr管理ディレクトリを持つ、一番近い上位ディレクトリのことです。"
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr "limitは整数でなければなりません。"
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr "levelsは整数でなければなりません。"
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr "ブランチ、もしくはブランチの一部の履歴ログを表示します。"
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+"logは、ブランチの履歴を見るためのbzrのデフォルトのツールです。\n"
+"対象のブランチは１つ目の引数で指定します。引数が指定されていなければ、\n"
+"作業ディレクトリを含むブランチの履歴が表示されます。\n"
+"簡単な例を以下に示します。::"
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+"  bzr log は、現在のブランチの履歴を表示します。\n"
+"  bzr log foo,py は、ブランチ内のファイルの履歴を表示します。\n"
+"  bzr log http://server/branch は、サーバ上のブランチのログを表示します。"
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+"フィルタリング、並び替え、各リビジョンに表示する情報については、以下のように\n"
+"変更できます。デフォルトでは、全てのリビジョンが(トポロジカルに)ソートされ、\n"
+"新しいリビジョンは古いリビジョンより前に、子孫のリビジョンは先祖より前に配置\n"
+"されます。マージされたリビジョンを表示する場合は、マージ先のリビジョンよりも\n"
+"インデントされて表示されます。"
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ":出力のコントロール:"
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+"  ログフォーマットの指定によって、各リビジョンの情報がどう表示されるかを\n"
+"  コントロールします。標準のログフォーマットには ``long`` 、``short`` 、 ``line``\n"
+"  があります。デフォルトはlongです。ログフォーマットについての詳細は\n"
+"  ``bzr help log-formats`` をご覧ください。"
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr "  以下のオプションで、どの情報を表示するかをコントロールできます。"
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+"    -l N        最大N個のリビジョンを表示します。\n"
+"    -n N        Nレベルのリビジョンを表示します。(0で全て、1でメインラインのみ)\n"
+"    -v          ステータスのサマリ(差分)を各リビジョンに表示します。\n"
+"    -p          Diff(patch)を各リビジョンに表示します。\n"
+"    --show-ids  リビジョン番号だけでなく、リビジョンIDとファイルIDも表示します。」"
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+"  デフォルトの表示レベルは、ログフォーマットの機能であることに注意してください。\n"
+"  -nオプションが使用されない場合は、標準のログフォーマットはトップレベル(メイン\n"
+"  ライン)だけを表示します。"
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+"  ステータスのサマリは、A、Mなどのフラグで表示されます。 かわりに ``added``、\n"
+"  ``modified`` などの単語で表示するには、-vvオプションを使用してください。"
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ":表示順のコントロール:"
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+"  古いリビジョンから新しいリビジョンの順で表示するには、 --forwardオプションを\n"
+"  使います。--forwardは、--reverseのようにログをインクリメンタルに表示はしません\n"
+"が、たいていの場合、ログ表示にかかる時間への影響はわずかです。"
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ":リビジョンのフィルタリング:"
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+"  -rオプションで、どのリビジョン、もしくはリビジョンの範囲を表示するかを指定する\n"
+"  ことができます。いろいろな例を以下に示します。::"
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+"    -rX      リビジョンXを表示\n"
+"    -rX..    リビジョンX以降を表示\n"
+"    -r..Y    リビジョンY以前(Yを含む)を表示\n"
+"    -rX..Y   リビジョンXからY(X、Yを含む)を表示"
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+"  X、Yの指定方法の詳細は、 ``bzr help revisionspec`` を参照してください。\n"
+"  よくある例を以下に示します。::"
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+"    -r-1                Tipだけを表示\n"
+"    -r-10..             メインラインの最新10リビジョンを表示\n"
+"    -rsubmit:..         このブランチでの変更内容を表示\n"
+"    -rancestor:path..   このブランチと別のブランチとの分岐点からの\n"
+"                        変更を表示\n"
+"    -rdate:yesterday..  昨日からの変更を表示"
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+"  -rX..Yでリビジョンの範囲を指定した場合、ログはリビジョンYから始まって\n"
+"  メインの(左側の)親をXに到達するまで遡ります。トップレベルだけを表示\n"
+"  する場合(-n1を使用)、Xがそのルート見つからなければエラーが発生します。\n"
+"  他段階のログ(-n0を使用)を表示する場合は、Xは入れ子になったマージ\n"
+"  リビジョンの中に見つかるかもしれません。その場合、ログは適切に切り捨て\n"
+"  られます。"
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ":パスのフィルタリング:"
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+"  パラメータが指定されていて、一つ目のパラメータがブランチではない場合、\n"
+"  指定されたファイル、ディレクトリが変更されたリビジョンだけが表示されます。"
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+"  ファイル名は、履歴のコンテキスト内で解釈されます。削除されたファイルの\n"
+"  ログを表示するには、そのファイルが存在したリビジョンを、リビジョンの範囲\n"
+"  の最初か最後に指定してください。"
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+"  履歴のコンテキストは、変名されたファイルやディレクトリのパス名を解釈する\n"
+"  際にも重要になります。以下の例を考えてください。："
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+"  * リビジョン 1: tutorial.txt を追加\n"
+"  * リビジョン 2: tutorial.txt\n"
+"  * リビジョン 3: tutorial.txt を guide.txt に変名し、add tutorial.txt を追加"
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr "  この場合:"
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr "  * ``bzr log guide.txt`` は、リビジョン1で追加されたファイルを表示します。"
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr "  * ``bzr log tutorial.txt`` は、リビジョン3で追加された新しいファイルを表示します。"
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+"  * ``bzr log -r2 -p tutorial.txt`` は、元のファイルのリビジョン2での変更\n"
+"    を表示します。"
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+"  * ``bzr log -r2 -p guide.txt`` は、リビジョン2にはguide.txtというファイルはない\n"
+"    というエラーを表示します。"
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+"  変名は常に履歴に表示されます。明示的に指定する必要はありません。(また、\n"
+"  最後に変名される以前のログを切り捨てる方法もありません)"
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ":その他のフィルタリング:"
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+"  --matchオプションで、正規表現にコミットメッセージ、コミッター、著者、バグが\n"
+"  マッチするリビジョンを検索することができます。オプションを複数回指定した\n"
+"  場合は、どれかひとつにマッチすれば検索されます。--match-author、\n"
+"  --match-bug、--match-committer、--match-messageで、指定したフィールド\n"
+"  だけを検索対象にすることができます。"
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ":Tips & tricks:"
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+"  履歴を見るには、CUIよりもGUIやIDEの方がいいことも多いでしょう。qlog、\n"
+"  qbzrやbzr-gtkのビジュアライゼーション、bzr-explorerシェル、LoggerHead\n"
+"  のWebインターフェイスなどが気に入るかもしれまん。プラグインガイド\n"
+"  <http://doc.bazaar.canonical.com/plugins/en/> や、\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration> をご覧ください。  "
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr "  ``bazaar.conf`` に以下のようなエイリアスを追加しておくと便利です。::"
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+"  ``bzr tip`` は最新のリビジョンを表示し、 ``bzr top`` はメインラインの最新の\n"
+"  10リビジョンを表示します。特定のリビジョンXの詳細を見るには、 ``bzr show -X``\n"
+"  を使用します。"
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr "  特定のマージXについて詳しく見たい場合は、 ``bzr log -n0 -rX`` を使用します。"
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+"  多くのリビジョンを持つブランチで ``bzr log -v`` を実行するのは、今の\n"
+"  ところ非常に遅いです。この問題の修正は現在対応中ですが、いずれに\n"
+"  しても、-vオプションを指定するときはリビジョンの範囲を指定することを\n"
+"  おすすめします。"
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+"  bzrには、包括的な全文検索マッチをするbzr-searchというプラグインがあり、\n"
+"  ユーザ名、コミットメッセージなどでリビジョンを検索することができます。\n"
+"  他の機能とはちがい、このプラグインでは単語のリストを含むすべての\n"
+"  リビジョンを検索することができます。"
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+"  深い履歴をもつ大規模なプロジェクトで、メインライン以外の履歴を見る場合は、\n"
+"  historycacheプラグインをインストールすることでパフォーマンスを大きく改善\n"
+"  することができます。このプラグインは、履歴情報をキャッシュして、ディスク\n"
+"  スペースと引き換えに高速なパフォーマンスをもたらします。"
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr "古い方から新しい方へ表示する"
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr "各リビジョンでのファイルの変更を表示する"
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr "指定されたリビジョンだけを表示する。 ``help revisionspec``を参照"
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr "誰を作者として表示するか - first、all、またはcommitter"
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr "作者"
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr "表示するレベル。-0で全て、1で１階層"
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr "最初のNリビジョンだけを出力する"
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr "各リビジョンでの変更をパッチとして表示"
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr "--levels 0 と同じようにマージされたリビジョンを表示する"
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr "複数の親を持つコミットを表示しない"
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr "共通の先祖に含まれないリビジョンだけを表示(-rX..Yを使用する必要がある)"
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr "デジタル署名を表示"
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr "この表現にマッチするプロパティのリビジョンを表示"
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr "この表現にマッチするメッセージのリビジョンを表示"
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr "コミッタが指定された表現にマッチするリビジョンを表示する"
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr "作者が指定された表現にマッチするリビジョンを表示する"
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr "バグ情報が指定された表現にマッチするリビジョンを表示します"
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr "--exclude-common-ancestryには、-rで2つのリビジョンを指定する必要があります。"
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr "最後のリビジョンにも最初のリビジョンにもパスが見つかりません: %s"
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr "bzr %s には、異なるブランチ上の2つのリビジョンは指定できません。"
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr "bzr %s --revision は1つまたは2つの値を取ります。"
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+"ツリー内のファイルをリストアップします。\n"
+"    "
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr "サブディレクトリも再帰で処理します。"
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr "ブランチのルートからの相対パスを表示します。"
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr "バージョン管理外のファイルを表示します。"
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr "バージョン管理されたファイルを表示します。"
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr "無視されたファイルを表示します。"
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr "指定された種別のアイテム(ファイル、ディレクトリ、シンボリックリンク)を表示します。"
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr "無効な種別が指定されました。"
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr "--verboseと--nullを同時に指定することはできません。"
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr "--from-rootとPATHを同時に指定することはできません。"
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr "指定されたファイルやパターンを無視します。"
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr "パターンの書き方の詳細は ``bzr help patterns`` をご覧ください。"
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+".bzrignoreファイルが存在しない場合は、ignoreコマンドはそれを作成して、\n"
+"指定されたファイルやパターンを追加します。また、.bzrignoreファイルは\n"
+"ignoreコマンドで自動的にバージョン管理に追加されます。ignoreコマンドを\n"
+"使わずに.bzrignoreファイルを手で作成した場合は、明示的にaddコマンドを\n"
+"呼ぶ必要があります。"
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+"無視リストからパターンを削除するには、.bzrignoreファイルを編集します。\n"
+"ignoreコマンドやエディタでこのファイルのエントリを追加、編集、削除した\n"
+"場合は、忘れずにコミットしてください。"
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+"Bazaarは、グローバルな無視ファイル ~/.bazaar/ignore もサポートしています。\n"
+"Windowsでは、このファイルはApplication Data ディレクトリにあります。\n"
+"(C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore)\n"
+"このファイルをこのコマンドで編集することはできないので、直接エディタで編集\n"
+"してください。"
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+"!で始まるパターンは、無視指定からの除外を表し、通常の無視指定よりも\n"
+"優先されます。これは、普通なら無視されるはずのファイルをバージョン管理\n"
+"の対象とするために使います。"
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+"!!で始まるパターンは、通常の無視指定として扱われますが、!による除外\n"
+"パターンよりも優先されます。"
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+":注意: \n"
+"    \n"
+"*シェルのワイルドカードをふくむ無視パターンを指定するときには、Unixシェル\n"
+"  による引用符でくくる必要があります。"
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+"* #で始まる無視パターンは、無視ファイル中のコメントとして扱われます。\n"
+"  #で始まるファイルを無視したい場合は、\"RE:\"プレフィックスを使ってください。"
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+":例:\n"
+"    トップレベルのMakefileを無視する::"
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr "        bzr ignore ./Makefile"
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr "    すべてのディレクトリの.classファイルを無視するが...::"
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr "        bzr ignore \"*.class\""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr "    ...\"special.class\" は無視しない::"
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr "        bzr ignore \"!special.class\""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr "    #で始まるファイルを無視する::"
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr "        bzr ignore \"RE:^#\""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr "    libディレクトリ配下の.oファイルを無視する::"
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr "        bzr ignore \"lib/**/*.o\""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr "        bzr ignore \"RE:lib/.*\\.o\""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr "    \"debian\"トップレベルディレクトリ以外の全てを無視する::"
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    ”local”トップレベルディレクトリ配下以外の全てを無視する,\n"
+"    ただし、~で終わる自動セーブファイルは、local/配下であっても無視する::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr "bzrが使用するデフォルトの無視ルールを表示します。"
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr "ignoreにはNAME_PATTERNか--default-rulesのどちらかは指定する必要があります。"
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] "無効な無視パターンが見つかりました。 %s"
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr "NAME_PATTERNに絶対パスは指定できません。"
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+"注意: 以下のファイルはバージョン管理されていますが、無視パターンにマッチしました。:\n"
+"%s\n"
+"これらのファイルは、'bzr remove'しない限りはバージョン管理されたままです。\n"
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr "無視するファイルとそれらにマッチするパターンの一覧を表示する。"
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr "無視されるファイルと、それがどのパターンによって無視されているかを一覧で表示します。"
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr "代わりにファイルの一覧だけを表示するには::"
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr "    bzr ls --ignored"
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr "無効なリビジョン番号です。: %r"
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr "最新、または過去のリビジョンを指定されたディレクトリもしくはアーカイブにエクスポートする。"
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr "リビジョンが指定されなければ、最終コミットのリビジョンをエクスポートします。"
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+"フォーマットはtar、tgz、tbz2のような”exporter”の名前になることができます。\n"
+" 何も渡されなければ、拡張子のフォーマットを見つけようとします。 拡張子がない\n"
+"場合は、ディレクトリにエクスポートします(–format=dirと同等)。"
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+"rootが指定された場合は、コンテナフォーマット(tar、zipなど)のルート\n"
+"ディレクトリに使用されます。指定されていない場合は、エクスポート\n"
+"ファイル名がデフォルトになります。rootオプションは、'dir'フォーマット\n"
+"に対しては作用しません。"
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr "ブランチが省略されると現在の作業ディレクトリを含むブランチが使用されます。"
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr "注: ASCIIではないファイルを含むツリーの、zipへのエクスポートはサポートされません。"
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+"  ====================     ====================\n"
+"  サポートフォーマット     拡張子による自動検出\n"
+"  ====================     ====================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  ====================     ===================="
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr "エクスポートするファイルの種類"
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr "使いやすい形でエクスポートするためのコンテンツフィルターを適用します。"
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr "エクスポートされたファイル内部のrootディレクトリの名前。"
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr "各ファイルの編集日時を、最後にそのファイルが変更されたリビジョンの日時に設定します。"
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr "最終リビジョンではなく、作業ツリーの内容をエクスポートします。"
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr "作業ツリーに対しては--uncommittedを指定する必要があります。"
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr "サポートされていないエクスポートフォーマット: %s"
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr "指定されたリビジョンのファイルの内容を標準出力に書き出します。"
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr "リビジョンが指定されなければ、最後のリビジョンが使用されます。"
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+"バイナリファイルでこのコマンドを使用する際には標準出力をリダイレクトするように\n"
+"気をつけてください。"
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr "古いツリーのパス名。"
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr "便利な形で表示するためのフィルタを適用します。"
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr "bzr cat --revisionにはリビジョンをひとつだけ指定します。"
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr "{0!r}はリビジョン{1}には存在しません。"
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr "変更を新しいリビジョンにコミットする。"
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+"それぞれのコミットに、その内容を説明するメッセージを指定する必要があります。\n"
+"これは、--messageオプションで指定(コマンドラインからメッセージを取得)したり、\n"
+"--fileオプションで指定(ファイルからメッセージを取得)します。どちらのオプションも\n"
+"指定されていない場合は、メッセージを入力するためのエディタが起動します。\n"
+"エディタにロードされる定型文の中に変更されたファイルの情報を含めるためには、\n"
+"--show-diffオプションを使用します。"
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+"デフォルトでは、ツリー全体がコミットされ、コミットを実行した人が著者になります。\n"
+"これは、以下のような方法で上書きすることができます。"
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ":部分的なコミット:"
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+"  ファイルが指定された場合、そのファイルの変更だけがコミットされます。\n"
+"  ディレクトリが指定された場合、そのディレクトリとその配下すべてが\n"
+"  コミット対象になります。"
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+"  excludesの指定は、コミット対象ファイルの指定よりも優先されます。\n"
+"  たとえば、foo配下の変更をコミットするが、foo/bar内はコミットしないという\n"
+"  場合は::"
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr "    bzr commit foo -x foo/bar"
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr "  マージ後の部分的なコミットはまだサポートされていません。"
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ":作者の変更:"
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+"  もし、変更を行った人とコミットする人がちがう場合は、作者の名前を--author\n"
+"  オプションで指定することができます。\"John Doe <jdoe@example.com>\"の\n"
+"  ように、コミッターのIDと同じフォーマットで指定するべきです。複数の作者が\n"
+"  いるなら、このオプションを複数回指定することもできます。"
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ":チェック:"
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+"  よくあるミスとして、新しく作ったファイルやディレクトリをコミット前に追加するのを\n"
+"  忘れてしまうということがあります。--strictオプションを指定すると、バージョン管理\n"
+"  外のファイルがある場合はコミットが失敗するようになります。もっと高度なコミット\n"
+"  前チェックをフックとして実装することもできます。詳細は ``bzr help hooks`` を\n"
+"  ご覧ください。"
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ":特記事項:"
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+"  もし、間違ったファイルをコミットしてしまったり、コミットメッセージにスペル\n"
+"  ミスがあった場合は、uncommitコマンドでコミットを取り消すことができます。\n"
+"  詳細は ``bzr help uncommit`` をご覧ください。"
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+"  コミット後にフックを実行することもできます。これによって、バグトラッカーなどの\n"
+"  外部のシステムを更新することができます。 --fixesオプションで、リビジョンと\n"
+"  バグとの関係を記録することができます。詳細は ``bzr help bugs`` を見て\n"
+"  ください。"
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr "指定されたパスの変更を無視します。"
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr "新しいリビジョンの説明。"
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr "何も変更されていなくてもコミットする。"
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr "このファイルからコミットメッセージを取得する。"
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr "作業ツリーの中にバージョン管理外のファイルが存在する場合コミットを拒否する。"
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr "コミット日時を決められたフォーマットで手動で指定します。例) '2009-10-10 08:00:00 +0100'"
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr "このリビジョンで修正されたバグをマークする(\"bzr help bugs\"を参照)。"
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr "著者の名前がコミッターとは異なる場合、著者の名前を設定する。"
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+"バインドされたブランチにローカルコミットを実行する。 通常のコミットが実行されるまで ローカルコミットはマスターブランチにpushされません。"
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr "メッセージが提供されないとき、 メッセージエディタでステータスの要約と一緒に差分を表示する。"
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr "外部のバージョン管理システムにコミットするときに、ネイティブに表現できないデータをプッシュしません。"
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+"バグ %s のバグトラッカーが指定されていません。'トラッカー:id'の形式にするか、デフォルトのトラッカーを `bugtracker` "
+"オプションで指定してください。\n"
+"詳細は \"bzr help bugs\" をご覧ください。コミットは拒否されました。"
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+"無効なバグです。 %s 'トラッカー:id' の形式で指定する必要があります。詳細は \"bzr help bugs\" をご覧ください。\n"
+"コミットは拒否されました。"
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr "不明なバグです。 %s コミットは拒否されました。"
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+"%s\n"
+"コミットは拒否されました。"
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr "--commit-timeをパースできません。: "
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr "--message か --file かどちらかを指定してください。"
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr "--messageか--fileのどちらかでコミットメッセージを指定してください。"
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+"空のコミットメッセージが指定されました。--messageか--fileでコミットメッセージを指定するか、--message "
+"\"\"で空メッセージを指定してください。"
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+"コミットする変更がありません。コミットしたいファイルを'bzr add'で追加するか、--unchangedを指定して空のコミットを実行してください。"
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr "作業ツリーに競合があります。\"bzr conflicts\" で表示して、\"bzr resolve FILE\"で解消してください。"
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr "作業ツリーにバージョン管理外のファイルがあるため、コミットが拒否されました。"
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+"\n"
+"マスタブランチにコミットするには、先にupdateしてください。\n"
+"--localを指定してオフラインでコミットし、作業を続けることもできます。"
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr "作業ツリーの構造、ブランチの一貫性、リポジトリの履歴をチェックします。"
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+"このコマンドは、データの破損やbzrのバグを検出するために、ブランチとリポジトリ\n"
+"ストレージの不変条件をチェックします。"
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+"作業ツリーとブランチのチェック結果は、問題が見つかったときだけ表示\n"
+"されます。リポジトリチェックの出力は次の通りです。:"
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+"revisions\n"
+"    チェックしたリビジョンの数です。これは問題ではありません。"
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+"versionedfiles\n"
+"    チェックしたバージョン管理ファイルの数です。これは問題では\n"
+"    ありません。"
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+"unreferenced ancestors\n"
+"    他のテキストの先祖だが、上位のリビジョンから参照されていない\n"
+"    と思われるテキストです。これは、Bazaarが対処できる軽微な\n"
+"    問題です。"
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+"unique file texts\n"
+"    チェックしたリビジョンの中にある、一意なファイルコンテンツの数です。\n"
+"    これは問題ではありません。"
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+"repeated file texts\n"
+"    チェックしたリビジョンの中にある、重複したテキストの数です。\n"
+"    ファイルのエントリが変更されたが、内容は変更されていない場合に、\n"
+"    重複が発生します。これは問題ではありません。"
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+"条件が指定されなければ、指定された場所の全てのBazaarデータが\n"
+"チェックされます。"
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr "    ‘foo’ でのツリーとブランチをチェックする::"
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr "        bzr check --tree --branch foo"
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr "    ‘bar’でのリポジトリのみをチェックする::"
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr "        bzr check --repo bar"
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr "    ‘baz’ ですべてをチェックする::"
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr "        bzr check baz"
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr "現在のディレクトリに関連したブランチをチェックする。"
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr "現在のディレクトリに関連したリポジトリをチェックする。"
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr "現在のディレクトリに関連した作業ツリーをチェックする。"
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr "リポジトリ、ブランチ、作業ツリーを新しいフォーマットにアップグレードします。"
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+"Bazaarのメジャーリリースの後にデフォルトのフォーマットが変更された場合、\n"
+"いくつかのオペレーションの際に、アップグレードすべきであると通知されます。\n"
+"新しいフォーマットへのアップグレードによって、パフォーマンスが改善されたり、\n"
+"新しい機能が使えるようになるでしょう。ただし、古いバージョンのリポジトリや\n"
+"Bazaarとの互換性には制限が発生するかもしれません。"
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+"デフォルトではなく特定のフォーマットにアップグレードしたい場合は、--format\n"
+"オプションで指定します。これを利用して、upgradeコマンドで昔のフォーマットに\n"
+"*\"ダウングレード\"* することもできますが、変換処理によっては不可逆なものも\n"
+"あります。(たとえば、1.xのデフォルトから2.xのデフォルトへの変換は不可逆です)\n"
+"そのため、ダウングレードできない場合もあります。"
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+"変換を開始したときに、 backup.bzr.~#~ というディレクトリが作成されます。\n"
+"(#は連番です) デフォルトでは、このフォルダは変換後も残ります。もし変換が\n"
+"失敗したら、新しい.bzrフォルダを削除して、このフォルダを元の名前に戻して\n"
+"ください。--cleanオプションを指定すると、変換が成功したらbackup.bzr\n"
+"ディレクトリは削除されます。そうでない場合は、変換後特に問題がなければ手で\n"
+"削除してください。"
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+"指定された場所が共用リポジトリの場合、リポジトリの変換が成功したら\n"
+"配下のブランチも変換されます。もしブランチの変換に失敗しても、他の\n"
+"ブランチの変換は続行されます。"
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+"アップグレードに関する詳細な情報は、Bazaar Upgrade Guideをご覧ください。\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr "指定されたフォーマットにアップグレードします。詳細は\"bzr help formats\"をご覧ください。"
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr "ブランチフォーマット"
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr "変換に成功したらbackup.bzrディレクトリを削除します。"
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr "何が実行されるかを表示しますが、実際には何もしません。"
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr "bzrのユーザIDを表示、設定します。"
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+":例:\n"
+"    現在のユーザのEメールを表示します。::"
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr "        bzr whoami --email"
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr "    ユーザを設定します。::"
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr "        bzr whoami \"Frank Chu <fchu@example.com>\""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr "Eメールアドレスだけを表示します。"
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr "全体設定ではなく、現在のブランチだけにIDを設定します。"
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr "--emailは、現在のIDを表示するためだけに使用できます。"
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr "ブランチのニックネームを表示または設定します。"
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+"設定されていない場合は、ツリーのルートディレクトリの名前が\n"
+"ニックネームとして扱われます。引数なしで実行すると、現在の\n"
+"ニックネームを表示します。"
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+"バインドされたブランチは、ローカルでニックネームが設定されていなければ\n"
+"マスタブランチのニックネームを使用します。"
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr "エイリアスの設定、解除、表示を行います。"
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+":例:\n"
+"    現在のエイリアスを表示します。::"
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr "        bzr alias"
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr "    'll'に設定されているエイリアスを表示します。::"
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr "        bzr alias ll"
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr "    エイリアス'll'を設定します。::"
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr "        bzr alias ll=\"log --line -r-10..-1\""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr "    エイリアス'll'を解除します。::"
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr "        bzr alias --remove ll"
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr "エイリアスを削除します。"
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr "bzr alias --removeには、削除するエイリアス名を指定する必要があります。"
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr "--benchmarkは、bzr2.2以降はサポートしていません。かわりにbzr-usertestを使用してください。"
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr "Bazaarのバージョンを表示します。"
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr "リビジョン番号を表示します。"
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr "マージの起点はリビジョン %s です。\n"
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr "3wayマージを実行します。"
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+"マージ元には、ブランチか、bzr sendで作られたマージディレクティブファイル\n"
+"のパスを指定できます。どちらも指定されていない場合は、アップストリームブランチ\n"
+"か、一番最後に--remember指定でマージした時のマージ元がデフォルトになります。\n"
+"別のブランチ内のファイルパスをマージ元として指定することもでき、その場合は\n"
+"指定されたファイルの変更だけが現在のブランチにマージされます。"
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+"ブランチからマージする場合、デフォルトでbzrは自動的に妥当なベースリビジョンを\n"
+"判定し、それ以降のすべての変更をマージしようとします。もしこれが失敗した場合は、\n"
+"明示的にベースリビジョンを指定する必要があります。"
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+"別の最終リビジョンを指定するには、\"-revision OTHER\"を指定します。この場合、\n"
+"OTHERまで(OTHERも含む)の全ての変更がマージされます。"
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+"もし、２つのリビジョンを指定した場合(\"--revision BASE..OTHER\")、BASEから\n"
+"OTHERの範囲(BASEは含まず、OTHERは含む)のリビジョンがマージされます。これに\n"
+"よってスキップされるリビジョンがある場合、つまりマージ先のリビジョンにBASE\n"
+"が含まれていない場合は、いわゆる\"チェリーピック\"が行われます。通常のマージ\n"
+"とはちがい、今のところBazaarではチェリーピックは追跡しません。変更は、普通の\n"
+"コミットのように見え、マージ元での変更履歴は保存されません。"
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr "リビジョン番号は常に元のブランチに関連します。"
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr "問題を解消したら、bzr resolveを使用してください。bzr conflictsもご覧ください。"
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+"デフォルトブランチが設定されていない場合、最初にマージを実行したときに\n"
+"設定されます。(これをしないようにするには、--no-rememberを指定します。)\n"
+"その後は、デフォルトのブランチを使用する時には指定を省略できるようになり\n"
+"ます。デフォルトを変更するには、--rememberを指定します。この値は、リモートの\n"
+"ブランチにアクセスできた時だけ保存されます。"
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+"マージの結果はマージ先の作業ツリー内に反映され、そこで(bzr diffを使って)\n"
+"レビューしたり、テストをしたあとで、コミットによって記録することができます。"
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+"コミットされていない変更がある場合は、--forceを指定しないとマージは拒否\n"
+"されます。--forceが指定された場合は、未コミットの変更を含む現在の作業ツリーに\n"
+"マージ元の変更がマージされます。--forceオプションを使えば、２つ以上の親を持つ\n"
+"マージリビジョンを作ることもできます。"
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+"コミット済みの変更ではなく、作業ツリー上での変更を別のブランチにマージしたい\n"
+"場合は、--uncommittedオプションを指定することができます。"
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+"変更を部分的にマージしたければ、\"merge -i\"を使用すれば、\"shelve\"と同じ\n"
+"ようにそれぞれのハンクをプロンプトで選択して適用することができます。"
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+":例:\n"
+"    bzr.devから全ての新しいリビジョンをマージします。::"
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr "        bzr merge ../bzr.dev"
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr "    bzr.devから、リビジョン82まで(82も含む)のリビジョンをマージします::"
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr "        bzr merge -r 82 ../bzr.dev"
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr "    リビジョン82での変更をマージし、それ以前の変更はマージしません。::"
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr "        bzr merge -r 81..82 ../bzr.dev"
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr "    /tmp/merge内のマージディレクティブを適用します。::"
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr "        bzr merge /tmp/merge"
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+"    feature1a、feature1bの２つのブランチから、３つの親を持つマージ\n"
+"    リビジョンを作ります。::"
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr "マージ先のツリーにコミットしていない変更があってもマージします。"
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr "ブランチの変更ではなく、作業コピー上のコミットしていない変更をマージします。"
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+"マージ先のリビジョンがマージ元のブランチにすべて含まれている場合、マージの\n"
+"かわりにpullを実行します。その場合は、コミットする必要はありません。"
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr "作業ディレクトリ以外にマージする場合の、マージ先のブランチ。"
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr "マージを実行するかわりに、マージされる内容のdiffを表示します。"
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr "変更をインタラクティブに選択します。"
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+"空ブランチへのマージは今のところサポートされていません。https://bugs.launchpad.net/bzr/+bug/308562"
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr "バンドル、マージディレクティブに対して--uncommittedを指定することはできません。"
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr "--uncommittedと--revisionを同時に指定することはできません。"
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr "なにもすることがありません。"
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr "ファイルを個別にpullすることはできません。"
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr "ブランチにコミットがありません。('bzr pull'を使うべきかもしれません)"
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr "Show-baseはこのマージタイプではサポートされません。 %s"
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr "衝突の縮小化は、このマージタイプではサポートされません。 %s"
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr "衝突の縮小化、ベースの表示ができませんでした。"
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr "対象の場所が設定も指定もされていません。"
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr "{0} 設定された {1} の場所 {2}"
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr "マージをやりなおします。"
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+"衝突を解決するために、別のマージ方法を試したい場合に、このコマンドを\n"
+"使用します。他のものより優れたマージ方法があり、remergeを使って個々の\n"
+"ファイルに別のマージ方法を試すことができます。"
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+"remergeのオプションの意味とデフォルトはmergeと同じです。違いは、\n"
+"remergeはマージ中状態のときだけ実行でき、特定のファイルを指定できる\n"
+"ということです。"
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+":例:\n"
+"    すべての衝突したファイルのマージをやり直し、通常のTHIS、OTHERの\n"
+"    テキストにくわえて衝突した領域のベーステキストを表示します。::"
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr "        bzr remerge --show-base"
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+"    \"foobar\"のマージを、weaveマージアルゴリズムでやりなおし、衝突領域の\n"
+"    縮小化処理も行います。::"
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr "        bzr remerge --merge-type weave --reprocess foobar"
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr "衝突したベースリビジョンのテキストを表示します。"
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+"remergeは通常のマージ後にだけ実行できます。チェリーピックや複数マージでは\r\n"
+"利用できません。"
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr "ファイルを過去のリビジョンに戻します。"
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+"ファイルのリストを指定すると、そのファイルだけが元に戻されます。\n"
+"そうでない場合は、全てのファイルが対象になります。--revisionで\n"
+"リビジョンを指定しない場合は、最後にコミットされたリビジョンが使用\n"
+"されます。"
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+"以前のリビジョンに戻さずにいくつかの変更を取り除くには、mergeをかわりに\n"
+"使用します。例えば、\"merge . -r -2..-3\" (.を忘れないように)で、最終リビジョン\n"
+"(-1)での変更はそのままで、その一つ前のリビジョン(-2)での変更だけを取り\n"
+"除くことができます。特定の変更をハンクごと取り除く方法は、shelveをご覧\n"
+"ください。"
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+"デフォルトでは、手で変更されたファイルは最初にバックアップされます。(merge\n"
+"コマンドで変更されただけのファイルはバックアップされません)バックアップ\n"
+"ファイル名は、元の名前に「.~#~」(#は数字)を付け足したものになります。"
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+"ファイル名を指定するときは、現在のファイル名か、対象リビジョン時点でのファイル\n"
+"名かを使うことができます。つまり、ファイル名指定で「削除の取り消し」のために\n"
+"revertを使うことができます。ディレクトリを指定した場合は、その配下のすべての\n"
+"変更が取り消されます。"
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+"対象のリビジョン以降にファイルが新しく追加されている場合は、そのファイルは\n"
+"削除されます。削除されるファイルが変更されている場合は、上記の通りに\n"
+"バックアップされます。バージョン管理外のファイルを含むディレクトリは削除され\n"
+"ません。"
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+"コマンドもしくは他のトピックのヘルプを表示する。\n"
+"    "
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr "全てのコマンドのヘルプを表示する。"
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr "2つのブランチの間のmergeされていない/pullされていない リビジョンを表示する。"
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr "OTHER_BRANCHはlocalもしくはremoteになります。"
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr "        bzr missing"
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr "        bzr missing http://server/branch"
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr "        bzr missing -r ..-10"
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr "        bzr missing --my-revision ..-10"
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr "リビジョンの表示順を逆転する。"
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr "ローカルブランチの変更のみを表示する。"
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr "--mine-onlyと同じ。"
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr "リモートブランチの変更のみを表示する。"
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr "--theirs-onlyと同じ。"
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr "リポジトリ内のデータを圧縮する。"
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr "インストールされたプラグインの一覧を表示する。"
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+"このコマンドは インストールされたプラグインの一覧を簡単な説明や\n"
+"バージョン情報とともに表示します。"
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr "--verboseを指定すると各プラグインのインストール先のパスが表示されます。"
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+":使い方:\n"
+"%s\n"
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ":使い方: %s\n"
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr "オプション \"%(name)s\" に対する不正な値 \"%(value)s\""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr "バージョン管理されたファイルのエラー"
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr "\"%(file_id)s\" にはリビジョン {%(revision_id)s} がありません。"
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr "\"%(file_id)s\" にはすでにリビジョン {%(revision_id)s} が存在しています。"
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr "テキストがチェックサムと一致しません: %(msg)s"
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr "エクスポートフォーマット %(format)r はサポートされていません"
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr "%(msg)s %(host)s%(port)s%(orig_error)s"
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr "接続が閉じられました: %(msg)s %(orig_error)s"
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr "接続がタイムアウトしました: %(msg)s%(orig_error)s"
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr "%(path)s の %(offset)s に対する不正な range アクセス: %(msg)s"
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr "%(path)s からの不正な HTTP レスポンス: %(msg)s%(orig_error)s"
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr "%(path) に対する不正な range %(range)r: %(msg)s"
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr "%(path)s に HTTP MIME 境界が見つかりません: %(msg)s"
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr "リダイレクションが多すぎます"
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr "作業ツリーに衝突があります"
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr "設定ファイル %(filename)s が UTF-8 でエンコードされていません\n"
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+"設定ファイル %(filename)s のパースエラー:\n"
+"%(error)s"
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr "%(username)r に有効な e-mail アドレスが含まれていないようです"
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr "\"%(command_line)s\" コマンドでのGPGサインに失敗しました"
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr "GPGシグネチャの検証に \"%(error)s\" で失敗しました。"
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr "ライブラリ \"%(library)s\" をインポートできません: %(error)s"
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr "python-gpgme がインストールされていません。これはシグネチャの検証に必要です。"
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr "作業ツリー %(basedir)s が最後のコミットから変更されています。 作業ツリーが変更されている場合weaveマージはできません。"
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr "グラフ %(graph)r がループしています。"
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr "%(filename)s は衝突していません"
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr "\"%(filename)s\" にバンドルが見つかりません。"
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr "いまのところ、ルートディレクトリの移動はサポートされていません"
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr "%(from_path)s から %(to_path)s へのリネームに失敗しました: %(why)s"
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+"移動できません。  %(from_path)s%(operator)s  %(to_path)s%(_has_extra)s%(extra)s"
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+"%(from_path)s%(operator)s から %(to_path)s%(_has_extra)s%(extra)s へリネームできません"
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr "エラーや警告だけを表示します。"
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr "使い方とオプションを表示します。"
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr "より詳細な情報を表示します。"
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr "詳細は \"help revisionspec\" を参照してください。"
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+"--help, -h     ヘルプを表示します。\n"
+"--verbose, -v  より詳細な情報を表示します。\n"
+"--quiet, -q    エラーや警告だけを表示します。"
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
+
+#~ msgid ""
+#~ "Merge will do its best to combine the changes in two branches, but there\n"
+#~ "are some kinds of problems only a human can fix.  When it encounters those,\n"
+#~ "it will mark a conflict.  A conflict means that you need to fix something,\n"
+#~ "before you should commit."
+#~ msgstr ""
+#~ "マージ処理は、二つのブランチの変更を結合するために最善を尽くしますが、人にしか\n"
+#~ "解決できない問題もあります。そのような問題にあたった場合は、それを衝突として\n"
+#~ "マークします。その場合、コミット前に何かしら修正しなければならないということに\n"
+#~ "なります。"
diff --git a/po/ms.po b/po/ms.po
new file mode 100644
index 0000000..f1457e0
--- /dev/null
+++ b/po/ms.po
@@ -0,0 +1,13237 @@
+# Malay translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Malay <ms@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:20+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] "%d tag dikemaskini"
+msgstr[1] "%d tag dikemaskini"
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "temui ralat:%s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr "Abaikan fail diluar paparan. Paparan ialah %s"
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr "Papar ringkasan status"
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/my.po b/po/my.po
new file mode 100644
index 0000000..f33da75
--- /dev/null
+++ b/po/my.po
@@ -0,0 +1,13237 @@
+# Burmese translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-05-18 07:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Burmese <my@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2012-05-19 05:52+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/nb.po b/po/nb.po
new file mode 100644
index 0000000..d5e945a
--- /dev/null
+++ b/po/nb.po
@@ -0,0 +1,13237 @@
+# Norwegian Bokmal translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-04-03 17:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-04-04 05:07+0000\n"
+"X-Generator: Launchpad (build 15055)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/nl.po b/po/nl.po
new file mode 100644
index 0000000..657200f
--- /dev/null
+++ b/po/nl.po
@@ -0,0 +1,13237 @@
+# Dutch translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:19+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr "Dat doet het zeker!\n"
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/oc.po b/po/oc.po
new file mode 100644
index 0000000..b714584
--- /dev/null
+++ b/po/oc.po
@@ -0,0 +1,13237 @@
+# Occitan (post 1500) translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-26 18:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:20+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
new file mode 100644
index 0000000..ef59732
--- /dev/null
+++ b/po/pl.po
@@ -0,0 +1,13238 @@
+# Polish translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-02-22 08:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish <pl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2012-02-23 05:14+0000\n"
+"X-Generator: Launchpad (build 14855)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100644
index 0000000..b8fec8e
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,13874 @@
+# Brazilian Portuguese translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-05-19 23:19+0000\n"
+"Last-Translator: João Lucas <joao-lucas@live.com>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Launchpad-Export-Date: 2012-05-20 04:54+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr "saltar {0} (maior que {1} de {2} bytes)"
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr "Desempilhar"
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr "Enviar para revisão %d."
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] "%d tag atualizada."
+msgstr[1] "%d tags atualizadas."
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr "Nenhuma revisão ou tags para enviar."
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr "Nenhuma revisão para enviar."
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr "verificado o ramo {0} formato {1}"
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "erro encontrado:%s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr "Ignorando arquivos fora da visualização. A visualização é %s"
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr "bzr %s --revision produz exatamente o identificador da revisão"
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr "Mostrar o resumo do estado."
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"Este é um relatório de arquivos desconhecidos e versionados, reportá-los\n"
+"agrupados por estado.  Estados possíveis são:"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+"adicionado\n"
+"    Versionado na cópia de trabalho, mas não na revisão anterior."
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+"removido\n"
+"    Versionado na revisão anterior, mas removido ou excluído\n"
+"    na cópia de trabalho."
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+"renomeado\n"
+"    O caminho deste arquivo foi alterado a partir da revisão anterior;\n"
+"    o texto também pode ter mudado. Isso inclui arquivos cujo\n"
+"    diretório pai foi renomeado."
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+"modificado\n"
+"    O texto mudou desde a versão anterior."
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+"tipo alterado\n"
+"    Tipo de arquivo foi alterado (por exemplo, de arquivo para o diretório)."
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+"desconhecido\n"
+"    Não versionado e não corresponde aos padrões de ignorar."
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+"Além disso para diretórios, links simbólicos e arquivos com um bit\n"
+"executáve alterado, o Bazaar indica seu tipo usando um caracter\n"
+"de fuga: '/', '@' ou '*' respectivamente. Estes adicionais podem ser\n"
+"desativados usando a opção '--no-classify'."
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+"Para ver arquivos ignorados use 'bzr ignored'.  Para detalhes sobre\n"
+"alterações em arquivos texto, use 'bzr diff'."
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+"Note que --short ou -S oferecem sinalizadores de status para cada item, "
+"similar\n"
+"ao comando status do Subversion. Para obter uma saída semelhante ao svn -q,\n"
+"use bzr status -SV."
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+"Se nenhum argumento for especificado, o status total do diretório\n"
+"de trabalho é mostrado. Caso contrário, apenas o status do arquivo\n"
+"ou diretório especificado é relatado. Se um diretório for passado, o\n"
+"status é relatado para tudo dentro deste diretório."
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+"Antes de mesclar são enviadas, as revisões pendentes do ponto de mesclagem\n"
+"mostrado. Para ver todas as revisões pendentes da mesclagem, use a opção -"
+"v.\n"
+"Para ignorar a exibição de pendência de informações e fundir completamente, "
+"use\n"
+"a opção no-pending ou especifique um arquivo/diretório."
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+"Para comparar o diretório de trabalho com uma revisão específica,\n"
+"passe uma simples revisão como argumento."
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+"Para ver quais arquivos foram alterados em uma revisão específica, ou entre\n"
+"duas revisões, passe uma intervalo de revisões como argumento.\n"
+"Isto irá produzir os mesmos resultados de 'bzr diff --summarize'."
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr "Use indicadores de status curto."
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr "Mostrar apenas arquivos versionados."
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr "Não mostrar mesclagens pendentes."
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr "Não marque o tipo do objeto através do indicador."
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+"bzr status --revision produz exatamente um ou dois especificadores de revisão"
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr "Você só pode fornecer um entre revision_id e --revision"
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr "Você deve fornecer qualquer um entre --revision e revision_id"
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr "O repositório %r não suporta acesso a textos de revisão tipo raw"
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr "O repositório {0} não contém revisão {1}."
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr "Você não pode especificar uma revisão NULL."
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+"Remover a árvore de trabalho a partir de um determinado ramo/projeto obtido."
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+"Desde um checkout leve é ​​pouco mais do que uma árvore de trabalho\n"
+"isso vai se recusar a executar contra um."
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr "Para recriar a árvore de trabalho, use \"bzr checkout\"."
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+"Remover a árvore de trabalho, mesmo que tenha mudanças não confirmadas ou "
+"arquivadas."
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr "Nenhuma árvore de trabalho para remover"
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr "Você não pode remover a árvore de trabalho de um caminho remoto"
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr "Você não pode remover a árvore de trabalho de um projeto importado"
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+"A árvore não parece estar corrompida. Você provavelmente vai querer usar "
+"\"bzr reverter\" como alternativa. Use \"--force\" se você tem certeza que "
+"deseja redefinir a árvore de trabalho."
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+", o cabeçalho parece estar corrompido, tente passar -r -1 para definir o "
+"estado como última submissão"
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr "falhou para redefinir o estado da árvore{0}"
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr "Mostrar o número da revisão atual."
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr "Este é equivalente ao número de revisões no ramo."
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr "--tre e --revision não podem ser usados juntos"
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+"Tags podem apenas serem colocadas em uma revisão simples, não em um intervalo"
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr "Mostrar número de revisão da árvore de trabalho."
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr "Adicionar arquivos ou diretórios especificados."
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+"Em modo não-recursivo, todos os itens nomeados são adicionados, \n"
+"independentemente de terem sido anteriormente ignorados. Um aviso \n"
+"é dado se qualquer um dos arquivos nomeados já estiverem versionados."
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+"No modo recursivo (o padrão), os arquivos são tratados da mesma maneira\n"
+"mas o comportamento é diferente para os diretórios. Os diretórios que\n"
+"já estão versionados não dão um aviso. Todos os diretórios, já versionado \n"
+"ou não, são pesquisados ​​para que arquivos ou subdiretórios que não \n"
+"são de nenhuma versão ou foram ignorados, possam ser adicionados. \n"
+"Esta pesquisa ocorre recursivamente dentro de diretórios \n"
+"versionados. Se nenhum nome é dado '.' é assumido."
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+"Um alerta será impresso quando árvores aninhadas forem encontradas,\n"
+"exceto que seja explicitamente ignorado."
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+"Portanto, dizendo simplesmente 'bzr add' assumimos que a \n"
+"versão de todos os arquivos são atualmente desconhecidas."
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+"Adicionar um arquivo cujo diretório pai não é versionado irá\n"
+"implicitamente adicionar o diretório pai, e assim por diante até a raiz. "
+"Isto significa\n"
+"que você nunca precisará adicionar explicitamente um diretório, eles apenas\n"
+"serão adicionados quando você adicionar um arquivo no diretório."
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+"--dry-run irá mostrar quais arquivos deveriam ser adicionados, mas na "
+"verdade\n"
+"não os adiciona."
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+"--file-ids-from tentará usar os ids de arquivo do caminho fornecido.\n"
+"Procura ids tentando encontrar um diretório pai correspondente com\n"
+"o mesmo nome, e depois pelo caminho absoluto. Esta opção é raramente \n"
+"necessária mas pode ser útil quando adicionar o mesmo arquivo lógico em \n"
+"duas ramificações que serão mescladas mais tarde (sem mostrar as duas "
+"adições \n"
+"como conflitos). Isto também pode ser útil quando estiver mesclando outro \n"
+"projeto dentro de um subdiretório deste."
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+"Quaisquer arquivos correspondentes com o padrão na lista ignorar não serão "
+"adicionados\n"
+"a menos que eles sejam explicitamente mencionados."
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+"No modo recursivo, arquivos maiores do que a opção de configuração \n"
+"add.maximum_file_size serão pulados. Itens nomeados nunca são pulados\n"
+"devido ao tamanho do arquivo."
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr "Não adiciona recursivamente o conteúdo dos diretórios."
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr "Pesquisa de arquivo por ids nesta árvore"
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr "ignorado {0} correspondente a \"{1}\"\n"
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr "Criar um novo diretório versionado."
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr "Isto é equivalente a criar o diretório e depois adicioná-lo."
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr "Nenhum erro existente, cria diretórios pais conforme necessário."
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr "%s adicionado\n"
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr "tipo especificado %r é inválido"
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr "Mover ou renomear um arquivo."
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr "    bzr mv ORIGEM... DESTINO"
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+"Se o último argumento é um diretório versionado, todos os outros nomes\n"
+"são movidos para ele. Caso contrário, deve haver exatamente dois argumentos\n"
+"e o arquivo é alterado para um novo nome."
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+"Se NOMEANTIGO não existe no sistema de arquivos, mas é versionado e\n"
+"NOVONAME existe no sistema de arquivos, mas não é versionado, mv\n"
+"assume que o arquivo foi movido manualmente e atualiza apenas\n"
+"seu inventário interno para refletir essa mudança. O mesmo é válido \n"
+"quando se deslocam muitos arquivos de ORIGEM para um DESTINO."
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr "Os arquivos não podem ser movidos entre os ramos."
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+"Mover apenas o identificador bzr do arquivo, porque o arquivo já foi movido."
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr "Prever que será renomeado automaticamente."
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr "Evite fazer alterações quando prever que será renomeado."
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr "--dry-run requer --auto."
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr "falta argumento de arquivo"
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr "não é possível mover a raiz do ramo"
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr "Apenas um caminho deve ser especificado para --auto."
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr "--after não pode ser especificado com --auto."
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+"para mover múltiplos arquivos, o destino deve ser um diretório versionado"
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr "Transformar esse ramo em um espelho de outro ramo."
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+"Por padrão, este comando só funciona em ramos não divergentes.\n"
+"Ramos são considerados não divergentes se o ramo de destino mais \n"
+"recentemente submetido é aquele que não foi mesclado (direta ou \n"
+"indiretamente) para o pai."
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+"Se os ramos divergiram, você pode usar 'bzr merge' para mesclar as "
+"alterações\n"
+"de um para o outro. Uma vez que um ramo se fundiu, o outro deve\n"
+"ser capaz de puxá-lo novamente."
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+"Se você quer substituir suas alterações locais e quer apenas a sua "
+"ramificação\n"
+"para corresponder com a remota, use pull --overwrite. Isto funcionará mesmo "
+"se\n"
+"as duas ramificações divergiram."
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+"Se não estiver definido a localização padrão, na primeira vez que o projeto "
+"for puxado será definido (use \n"
+"--no-remember para evitar isso). Após isso, você pode omitir a localização\n"
+"para usar o padrão. Para alterar o padrão, use --remember. O valor será\n"
+"salvo apenas se o local remoto puder ser acessado."
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+"A opção --verbose irá mostrar as revisões extraídas usando a opção\n"
+"de configuração log_format. Você pode usar um formato diferente para \n"
+"substituí-lo com -Olog_format=<outro formato>."
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+"Nota: a localização pode ser especificada ou na forma de uma ramificação,\n"
+"ou na forma de um caminho para um arquivo contendo uma diretiva\n"
+"de mesclagem gerada com bzr send."
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr "Mostrar os logs de revisões puxadas."
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+"Ramificação para extrair, ao invés de uma que contém o diretório de trabalho."
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+"Realizar uma extração local em uma ramificação limite. Extrações locais não "
+"são aplicadas na ramificação mestre."
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr "Necessário a árvore de trabalho para --show-base."
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr "Nenhuma localização de extração conhecida ou especificada"
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr "Usando a localização pai salva: %s\n"
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr "Não foi possível usar -r com diretivas mescladas ou empacotadas"
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr "Atualização de um espelho deste ramo."
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+"A ramificação alvo não terá sua árvore de trabalho populada porque isto\n"
+"é dispendioso e não suportado em sistema de arquivos remoto."
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+"Alguns servidores inteligentes ou protocolos * pode * colocar a árvore de "
+"trabalho em vigor no\n"
+"futuro."
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+"Este comando funcionará apenas em ramificações que não possuem divergências. "
+"Ramificações \n"
+"são consideradas divergentes se a ramificação de destino possui envios mais "
+"recentes e \n"
+"não pode ser fundida (direta ou indiretamente) pela ramificação de origem."
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+"Se ramificações estão divergentes, você pode usar 'bzr push --overwrite' "
+"para substituir\n"
+"a outra ramificação completamente, discartando mudanças não fundidas."
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+"Se você deseja certificar-se que possui mudanças diferentes em outra "
+"ramificação,\n"
+"faça um merge (veja bzr help merge) a partir da outra ramificação, e envie-"
+"o. Após isto\n"
+"você será capaz de fazer um push sem \"'--overwrite\"."
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+"Se não houver um definição de localização de envio padrão, o primeiro envio "
+"irá ajustá-lo (use\n"
+"--no-remember para evitar isto). Após isto você poderá omitir a\n"
+"localização para usar o padrão. Para alterar o padrão, use --remember. O\n"
+"valor será salvo apenas se a localização remota puder ser acessada."
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+"A opção --verbose irá exibir as revisões enviadas usando a opção de \n"
+"configuração log_format. Você pode usar um formato diferente substituindo-o "
+"\n"
+"com -Olog_format=<outro_formato>"
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+"Ramo para enviar a partir de, ao invés de uma que contém o diretório de "
+"trabalho."
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+"Por padrão o envio irá falhar se o diretório de destino existir, mas não se "
+"tem um diretório de controle. Este sinalizador permitirá que o envio "
+"prossiga."
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+"Criar uma ramificação empilhada que referencia a localização pública do ramo "
+"pai."
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+"Criar uma ramificação empilhada que referencia a outro ramo do histórico de "
+"envio.  Apenas o trabalho não presente no ramo referenciado é incluído no "
+"ramo criado."
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+"Recusa o envio se houver alterações não confirmadas na árvore de trabalho, --"
+"no-strict desativa a verificação."
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+"Não popular a árvore de trabalho, mesmo para protocolos que o suportam."
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr "Não foi possível determinar uma ramificação a ser referenciada"
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+"Nenhuma localização de envio é conhecida ou foi especificada. Para enviar "
+"para o ramo pai (em %s), use 'bzr push :pai'."
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr "Sem local de envio conhecido ou especificado."
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr "Usando localização de envio salvo: %s"
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr "Criar um novo ramo que é uma cópia de um ramo existente."
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+"Se TO_LOCATION for omitido, o último componente de FROM_LOCATION será\n"
+"usado. Em outras palavras, \"branch ../foo/bar\" vai tentar criar ./bar.\n"
+"Se FROM_LOCATION não possuir / ou separador de caminho embutido,\n"
+"TO_LOCATION será derivado de FROM_LOCATION se retirando o esquema\n"
+"ou identificador de drive, se existirem. Por exemplo, \"branch lp:foo-bar\"\n"
+"tentará criar ./foo-bar."
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+"Para conseguir o ramo de uma revisão em particular, forneça o parâmetro --"
+"revision\n"
+"como em \"branch foo/bar -r 5\"."
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr "Os sinônimos 'clone e 'get' para esse comando são obsoletos."
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr "Criar um ramo sem uma árvore de trabalho."
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr "Alterar o checkout no diretório atual para o novo ramo."
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+"Cria um ramo empilhado se referindo ao ramo fonte. O novo ramo vai depender "
+"da disponibilidade do ramo fonte para todas as operações."
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr "Não utilizar um repositório compartilhado, mesmo se disponível."
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+"Por padrão, um ramo irá falhar se apontar para um diretório que existe mas "
+"não tem ainda um diretório de controle. Esta opção irá permitir o ramo de "
+"continuar."
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr "Vincular novo ramo a partir da localização."
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr "Diretório alvo \"%s\" já existe."
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr "Pasta pai de \"%s\" não existe."
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr "O ramo {0} não tem revisão {1}."
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr "Criado novo ramo empilhado referente a %s."
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] "Revisão %d ramificada."
+msgstr[1] "Revisões %d ramificadas."
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr "Novo ramo ligado a %s"
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr "Trocado para o ramo: %s"
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr "Lista os ramos disponíveis na localização atual."
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr "Esse comando irá mostrar os nomes de todos os ramos no local atual."
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+"Pesquisar recursivamente por ramos ao invés de apenas procurar em um local "
+"especificado."
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr "(padrão)"
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr "Criar um novo checkout de um ramo existente."
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+"Se BRANCH_LOCATION for omitido, o checkout irá reconstituir a árvore de\n"
+"trabalho para o ramo encontrado em '.'. Isto é útil se você tiver removido "
+"a\n"
+"árvore de trabalho ou se ela nunca foi criada - i.e. se você enviou o ramo\n"
+"para o seu local atual usando SFTP."
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+"Se TO_LOCATION for omitido, o último componente de BRANCH_LOCATION será\n"
+"usado. Em outras palavras, \"checkout ../foo/bar\" vai tentar criar ./bar.\n"
+"Se BRANCH_LOCATION não possuir / ou separador de caminho embutido,\n"
+"TO_LOCATION será derivado de BRANCH_LOCATION se retirando o esquema\n"
+"ou identificador de drive, se existirem. Por exemplo, \"checkout lp:foo-"
+"bar\"\n"
+"tentará criar ./foo-bar."
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+"Para obter um ramo como uma revisão específica, informe o parâmetro\n"
+"--revision, como em \"checkout foo/bar -r 5\". Note que isso estará\n"
+"imediatamente desatualizado [logo você não pode submeter] mas pode\n"
+"ser útil (i.e. para examinar código antigo)."
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+"Realize um checkout leve. Checkouts leves dependem do acesso ao ramo para "
+"cada operações. Checkouts normais podem realizar operações comuns como diff "
+"e status sem esse acesso, e também tem suporte a submissões locais."
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr "Obter o conteúdo do arquivo desta árvore."
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr "Use hard-link na árvore de trabalho sempre que possível."
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+"Mostrar a lista de arquivos renomeados.\n"
+"    "
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr "Atualizar a árvore de trabalho para a nova revisão."
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+"Isto irá realizar uma mesclagem da revisão de destino (a ponta do ramo,\n"
+"ou a revisão especificada) com a árvore de trabalho, e então fazer\n"
+"daquela revisão a revisão base para a árvore de trabalho.  "
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+"Você pode usar isso para visitar uma revisão antiga, ou para atualizar a "
+"árvore de trabalho\n"
+"que está desatualizada de seu ramo."
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+"Se houver quaisquer alterações não submetidas na árvore, elas serão\n"
+"guardadas e continuarão como alterações nao submetidas após a\n"
+"atualização. Para descartar estas alterações, use 'bzr revert'. As "
+"alterações\n"
+"não submetidas podem conflitar com as alterações trazidas pela alteração\n"
+"da revisão de base."
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+"Se ramo da árvore está ligado a um ramo mestre, o bzr também atualizará\\\n"
+"o ramo a partir do ramo mestre."
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+"Você não pode atualizar apenas um arquivo ou diretório, porque cada árvore\n"
+"de trabalho do Bazaar só possui uma única revisão de base. Se você quiser\n"
+"recuperar um arquivo que foi removido localmente, use 'bzr revert' ao invés\n"
+"de 'bzr update'. Se você quiser recuperar um arquivo para o seu estado em\n"
+"uma revisão anterior, use 'bzr revert' com a opção '-r', ou use 'bzr cat' "
+"para\n"
+"escrever o conteúdo do arquivo antigo em um novo local."
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+"O argumento 'dir', se fornecido, deve ser a localização da raiz da\n"
+"árvore de trabalho a ser atualizada. Por padrão, a árvore de trabalho que \n"
+"contém o diretório atual é usada."
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr "bzr update --revision tem exatamente uma revisão"
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+"bzr update só pode atualizar uma árvore inteira, e não um arquivo ou "
+"subdiretório."
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr "Árvore está atualizada na revisão {0} do ramo {1}"
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+"o ramo não tem revisão %s\n"
+"bzr update --revision só funciona para uma revisão no histórico da "
+"ramificação."
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr "Atualizado para a revisão {0} do ramo {1}"
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+"Suas submissões locais agora serão mostradas como pendentes de mesclagem com "
+"'brz status', e podem ser submetidas com 'bzr commit'."
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+"Mostrar informações sobre uma árvore de trabalho, ramo ou repositório."
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+"Esse comando irá mostrar todos os locais conhecidos e formatos associados à\n"
+"árvore, ramo ou repositório."
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+"No modo detalhado, informações estatísticas são incluídas em cada "
+"relatório.\n"
+"Para ver informações estatísticas mais avançadas, use o nível de "
+"detalhamento 2 ou\n"
+"superior especificando a opção de detalhamento múltiplas vezes, e.g. -vv."
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+"Ramos e árvores de trabalho irão também reportar qualquer falta de revisão."
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ":Exemplos:"
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr "  Exibir informações sobre o formato e locais relacionados:"
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr "    bzr info"
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+"  Exibir acima as informações juntas sobre o formato estendido e "
+"estatísticas básicas (como o número de arquivos na árvore de trabalho e "
+"número de revisões no ramo e repositório):"
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr "    bzr info -v"
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr "  Mostrar acima junto com o número de committers para o ramo:"
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr "    bzr info -vv"
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr "Remove arquivos ou diretórios."
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr "Remover apenas arquivos que nunca foram enviados."
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr "O modo de exclusão do arquivo a ser utilizado."
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr "Estratégia de exclusão"
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr "Backup de arquivos alterados (padrão)."
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr "Excluir do brz mas deixe a cópia de trabalho."
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr "Não faça backup de arquivos alterados."
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+"Apagar todos os arquivos especificados, mesmo que eles não possam ser "
+"recuperados e até mesmo se eles são diretórios não vazios. (obsoleto, use no-"
+"backup)"
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+"(A opção --force é obsoleta,  preferencialmente use --no-backup no futuro.)"
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr "Nenhum arquivo correspondente."
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr "Reconciliar metadados bzr em um ramo."
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+"No mesmo tempo em que ele é executado ele pode recompactar os dados, "
+"resultando em\n"
+"num potencial ganho de espaço em disco e desempenho."
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+"O ramo *deve* estar em um sistema listável tal como um disco local ou um "
+"sftp."
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+"Formato para série 2.0 bzr.\n"
+"Usa compressa de grupo de armazenamento.\n"
+"Fornece raízes ricas com transição de sentido único.\n"
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+"Pacote baseado em formato utilizado na série 1.x. Introduzido em 0,92. "
+"Interopera com repositórios bzr antes de 0,92, mas não pode ser lido por bzr "
+"<0,92. "
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr "O formato 2a possui suporte experimental para ramos co-locados.\n"
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr "Crie um diretório em um ramo versionados."
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+"Use isso para criar um ramo vazio, ou antes de importar um\n"
+"projeto existente."
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+"Se já houver um ramo no local mas este não tem árvore de trabalho,\n"
+"a árvore pode ser povoada com 'bzr checkout'."
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr "Receita para importação de uma árvore de arquivos::"
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"projeto importado\""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr "Criar o caminho que conduz até o ramo se ele não existir."
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr "Especifique um formato para esse ramo. Consulte \"help formats\"."
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+"Nunca mude o número de revisão ou o log existente. Somente adicione revisões "
+"a ele."
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr "Criar um ramo sem uma árvore de trabalho."
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+"Diretório pai de %s não existe.\n"
+"Você deve fornecer --create-prefix para criar todos os principais diretórios "
+"pai."
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+"Esse formato de ramo não pode ser mandado para append-revisions-only. Tente -"
+"-default."
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr "Criou um {0} (formato: {1})\n"
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr "Usando repositório compartilhado: %s\n"
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+"Criar um repositório compartilhado de ramos para dividir espaço de "
+"armazenamento."
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+"Novos ramos criados sob o diretório do repositório irão armazenar suas\n"
+"revisões no repositório, não no diretório do ramo. Para ramos\n"
+"com histórico compartilhado, isto reduz a quantidade de armazenamento "
+"necessário e\n"
+"acelera a criação de novos ramos."
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+":Exemplos:\n"
+"    Cria um repositório compartilhado contendo apenas ramos::"
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr "    Faça um leve checkout em outro lugar::"
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (adicione arquivos aqui)"
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+"Especifique um formato para este repositório. Veja \"bzr help formats\" para "
+"detalhes."
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr "Formato de repositório"
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+"Ramos no repositório será o padrão para não ter uma árvore de trabalho."
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+"Mostrar diferenças na árvore de trabalho, entre as revisões ou ramos."
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+"\"bzr diff -p1\" é equivalente a \"bzr diff --prefix old/:new/\", e\n"
+"produz caminhos adequados para \"patch -p1\"."
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+":Valores de saída:\n"
+"    1 - alterado\n"
+"    2 - mudanças irrepresentáveis\n"
+"    3 - erro\n"
+"    0 - Sem alteração"
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+":Exemplos:\n"
+"    Mostra a diferença da árvore de trabalho em relação a última submissão::"
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr "        bzr diff"
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr "    Diferença entre a árvore de trabalho e a revisão 1::"
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr "        bzr diff -r1"
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr "    Diferença entre a revisão 3 e a revisão 1::"
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr "        bzr diff -r1..3"
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr "    Diferença entre a revisão 3 e a revisão 1 para o ramo xxx::"
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr "        bzr diff -r1..3 xxx"
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+"    As alterações introduzidas pela revisão 2 (equivalente a -r1..2)::"
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr "        bzr diff -c2"
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+"    Para ver as alterações introduzidas pela revisão X::\n"
+"    \n"
+"         bzr diff-cX"
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr "        bzr diff -r<chosen_parent>..X"
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+"    As mudanças entre a versão atual e a versão anterior\n"
+"    (equivalente a -c-1 e -r-2..-1)"
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr "        bzr diff -r-2.."
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr "    Mostrar somente as diferenças para o arquivo NEWS::"
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr "        bzr diff NEWS"
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+"    Mostrar as diferenças na árvore de trabalho xxx para o arquivo NEWS::"
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr "        bzr diff xxx/NEWS"
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr "    Mostrar as diferenças do ramo xxx para esta árvore de trabalho:"
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr "        bzr diff --old xxx"
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr "    Mostrar as diferenças entre dois ramos para o aquivo NEWS::"
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr "        bzr diff --old xxx --new yyy NEWS"
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+"    O mesmo que 'bzr diff' exceto caminhos iniciados com velho/ e novo/::"
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr "Passar essas opções para o programa \"diff\" externo."
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr "Árvore/ramo para a comparar estado anterior."
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr "Árvore/ramo para a comparar estado posterior."
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr "Use este comando para comparar arquivos."
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr "Formato a ser usado no \"diff\"."
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr "Formato do \"diff\"."
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+"--prefix espera dois valores separados por dois pontos (exemplo: "
+"\"antigo/:novo/\")"
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr "bzr diff --revision espera exatamente um ou dois números de revisão"
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr "{0} e {1} são mutuamente exclusivos"
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+"Listar arquivos apagados na árvore de trabalho\n"
+"    "
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr "Mostra o diretório raiz da árvore."
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+"A raíz é o diretório pai mais próximo que contém um diretório de\n"
+"controle .bzr."
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr "O argumento de limite deve ser um inteiro."
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr "O argumento de níveis deve ser um inteiro."
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+"Mostrar os registros temporais para um ramo ou subconjunto de um ramo."
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+"  bzr log                       registra o ramo atual\n"
+"  bzr log foo.py                registra um arquivo neste ramo\n"
+"  bzr log http://server/branch  registra um ramo no servidor"
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ":Controle de saída:"
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+"  As seguintes informações podem ser usadas para controlar quais informações "
+"são\n"
+"  mostradas::"
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+"  Note que o número padrão de níveis a serem exibidos é uma função do\n"
+"  formato log. Se a opção -n não é usada, os formatos log padrão mostram\n"
+"  simplesmente o nível máximo (linha principal)."
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+"  Veja ``bzr help revisionspec`` para detalhes de como especificar X e Y.\n"
+"  Alguns exemplos comuns são dados abaixo::"
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+"  Contexto histórico também é importante quando você está interpretando os "
+"caminhos de \n"
+"  arquivos/diretórios renomeados. Considere o seguinte exemplo:"
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+"  * revisão 1: adicionar tutorial.txt\n"
+"  * revisão 2: modificar tutorial.txt\n"
+"  * revisão 3: renomear tutorial.txt para guide.txt; adicionar tutorial.txt"
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr "  Nesse caso:"
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+"  * ``bzr log guide.txt`` ira registrar o arquivo adicionado na revisão 1"
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+"  * ``bzr log tutorial.txt`` ira registrar o novo arquivo adicionado a "
+"revisão 3"
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+"  * ``bzr log -r2 -p tutorial.txt`` ira mostrar as mudanças feitas no\n"
+"    arquivo original na revisão 2."
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+"  * ``bzr log -r2 -p guide.txt`` ira mostrar uma mensagem de erro pois\n"
+"    não há um arquivo chamado guide.txt na revisão 2."
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ":Dicas & truques:"
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr "  Você pode achar útil adicionar atalhos no ``bazaar.conf``::"
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+"  Se você estiver interessado em olhar mais profundamente uma mesclagem X,\n"
+"  use ``bzr log -n0 -rX``."
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr "Mostrar mais antiga para a mais recente."
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr "Mostrar os arquivos mudaram em cada revisão."
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+"Mostra apenas a versão especificada. Veja também \"help revisionspec\"."
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr "Autores"
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr "Limite a saída as primeiras N versões."
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr "Mostrar alterações feitas em cada revisão como um caminho."
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr "Não reportar submissões com mais de um pai."
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr "Mostrar a validade da assinatura digital."
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr "Mostrar versões onde as propriedades coincidem com essa expressão."
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr "Mostrar versões onde a mensagem coincide com essa expressão."
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr "Mostrar versões onde os autores coincidem com essa expressão."
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr "Mostrar versões que tem erros que coincidem com essa expressão."
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr "--exclude-common-ancestry requer -r com duas versões."
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr "Caminho desconhecido no final ou começo do intervalo da versão: %s"
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr "bzr %s não aceita duas versões em diferentes ramos."
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr "bzr %s --revision tem um ou dois valores."
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+"Lista os arquivos em uma árvore.\n"
+"    "
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr "Imprimir arquivos desconhecidos."
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr "Imprimir arquivos versionados."
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr "Imprimir arquivos ignorados."
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+"Lista entradas de um tipo particular: arquivo, diretório ou ligação "
+"simbólica."
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr "Tipo especificado inválido"
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr "Não se pode definir --verbose e --null ao mesmo tempo."
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr "Não se pode definir --from-root e CAMINHO ao mesmo tempo"
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr "Ignora arquivos ou padrões especificados."
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr "Veja ``bzr help patterns`` para detalhes sobre o padrão da sintaxe."
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr "        bzr ignore ./Makefile"
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr "    Ignora arquivos .class em todos os diretórios...::"
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr "        bzr ignore \"*.class\""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr "    ...mas não ignora \"special.class\"::"
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr "        bzr ignore \"!special.class\""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr "    Ignora arquivos cujo nome começa com o caracter \"#\"::"
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr "        bzr ignore \"RE:^#\""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr "    Ignora arquivos .o no diretório lib::"
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr "        bzr ignore \"lib/**/*.o\""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr "        bzr ignore \"RE:lib/.*\\.o\""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr "    Ignora tudo exceto o diretório \"debian\" primário::"
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignora tudo exceto o diretório \"local\" primário,\n"
+"    mas sempre ignora arquivos automáticos terminados em \"~\", mesmo dentro "
+"de local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr "NOME_DO_PADRAO não deve ser um caminho absoluto"
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+"Alerta: os seguintes arquivos são controlados por versão e coincidem com o "
+"seu padrão de ignorar:\n"
+"%s\n"
+"Esses arquivos continuarão a ser controlados por versão a menos que você os "
+"remova 'brz remove'.\n"
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr "Listar os arquivos ignorados e os padrões que coincidem com eles."
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+"Listar todos os arquivos ignorados e os padrões de ignorar que fizeram com "
+"que o arquivo\n"
+"fosse ignorado."
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr "Alternativamente, listar apenas os arquivos::"
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr "    bzr ls --ignored"
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr "não é um número de revisão válido: %r"
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr "Exporta a revisão atual ou antiga para um diretório ou arquivo."
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+"Caso nenhuma revisão seja especificada isto exporta a última versão "
+"submetida."
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+"Se o ramo for omitido então o ramo contando o diretório atual de \n"
+"trabalho será utilizado."
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+"Nota: Exportar da árvore com arquivos nomeados em formato não-ASCII, não é "
+"suportado."
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+"  =================       =========================\n"
+"  Formatos suportados       detectados pela extensão\n"
+"  =================       =========================\n"
+"     dir                         (nenhum)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr "Tipo do arquivo para exportar para."
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr "Aplicar filtros de conteúdo para exportar de forma conveniente."
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr "Nome do diretório raiz dentro do arquivo exportado."
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+"Ajuste o tempo de modificação dos arquivos para a última revisão em que eles "
+"foram modificados."
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr "Exportar o conteúdo da árvore de trabalho antes da última revisão."
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr "--uncommitted requer uma árvore de trabalho"
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr "Formato de exportação não suportado: %s"
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr "Caso nenhuma revisão seja designada, a última versão é usada."
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr "O caminho do arquivo na antiga árvore."
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr "Aplicar filtros de conteúdo para exibir de forma conveniente."
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr "bzr cat --revision pega exatamente especificador de versão."
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr "{0!r} não está presente na versão {1}"
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr "Submeter alterações para uma nova versão."
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ":Submissões seletivas:"
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr "    bzr commit foo -x foo/bar"
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ":Notas:"
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr "Não considerar as alterações feitas para um determinado caminho."
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr "Descrição da nova revisão."
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr "Usar commit, mesmo que nada tenha mudado."
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+"Recuse submeter se houver arquivos desconhecidos na árvore de trabalho."
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+"Defina uma data de submissão manualmente usando formato de data de "
+"submissão, ex. '2009-10-10 08:00:00 +0100'."
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+"Marque um bug como estando corrigido por esta versão (ver \"bzr help bugs\")."
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+"Defina o nome do autor, se este for diferente do usuário que submeteu."
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+"Nenhum rastreador especificado para o bug %s. Use a forma 'tracker:id' ou "
+"especifique um rastreador de bug padrão usando a opção `bugtracker`.\n"
+"Veja \"bzr help bugs\" para mais informações sobre este recurso. Submissão "
+"recusada."
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+"Bug inválido %s. Deve estar na forma de 'tracker:id'. Veja \"bzr help bugs\" "
+"para mais informações sobre este recurso.\n"
+"Submissão recusada."
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr "Bug não reconhecido %s. Submissão recusada."
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+"%s\n"
+"Submissão recusada."
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr "por favor especifique --message ou --file"
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+"por favor especifique uma mensagem de submissão com --message ou --file"
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+"Conflitos detectados na árvore de trabalho. Use \"bzr conflicts\" para "
+"listar, \"bzr resolve FILE\" para decidir."
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+"Submissão recusada por haver arquivos desconhecidos na árvore de trabalho."
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+"Se restrições não forem especificadas, todos os dados do Bazaar que forem "
+"encontrados\n"
+"no local dado serão checados."
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr "    Cheque a árvore e ramo em 'foo'::"
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr "        bzr check --tree --branch foo"
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr "    Cheque apenas o repositório em 'bar'::"
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr "        bzr check --repo bar"
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr "    Cheque tudo em 'baz'::"
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr "        bzr check baz"
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr "Cheque o ramo relacionado ao diretório atual."
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr "Cheque o repositório relacionado ao diretório atual."
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr "Cheque a árvore de trabalho relacionada ao diretório atual."
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+"Atualize um repositório, ramo ou árvore de trabalho para um formato mais "
+"recente."
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+"Para mais informações sobre atualizações, veja o Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+"Atualize para um formato específico. Veja \"bzr help formats\" para detalhes."
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr "Formato de ramo"
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr "Remover o diretório backup.bzr se for bem sucedido."
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr "Mostra o que seria feito, mas na realidade não faz nada."
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr "Mostrar ou definir o id do usuário do bzr."
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr "        bzr whoami --email"
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr "    Definir o usuário atual::"
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr "        bzr whoami \"Frank Chu <fchu@example.com>\""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr "Mostra apenas o endereço de email."
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr "Definir uma identidade para o ramo atual ao invés de globalmente."
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr "--email pode apenas ser usado para exibir identidade existente"
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr "Imprime ou define o apelido do ramo."
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+":Exemplos:\n"
+"    Mostra os atalhos atuais::"
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr "        bzr alias"
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr "    Mostrar os atalhos especificados para 'll'::"
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr "        bzr alias ll"
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr "    Definir um atalho para 'll'::"
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr "        bzr alias ll=\"log --line -r-10..-1\""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr "    Para remover um atalho para 'll'::"
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr "        bzr alias --remove ll"
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr "Remove o atalho."
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr "bzr alias --remove espera por um apelido(alias) para remover."
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+"subunit não disponivel. É preciso instalar subunit para usar --subunit."
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr "--benchmark não é suportado por bzr 2.2; utilize bzr-usertest"
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr "Mostra a versão do bzr."
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr "Mostra apenas o número da versão."
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr "Com certeza faz!\n"
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr "a base da mesclagem é a revisão %s\n"
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr "Realizar uma mesclagem de três-vias."
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr "Os números da revisão são sempre relativos ao ramo fonte."
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+"Use brz resolve quando você tiver um problema solucionado. Veja também bzr "
+"conflicts."
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+":Exemplos:\n"
+"    Para mesclar todas as verões de bzr.dev::"
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr "        bzr merge ../bzr.dev"
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr "    Para mesclar mudanças e incluir a versão 82 de bzr.dev::"
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr "        bzr merge -r 82 ../bzr.dev"
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+"    Para mesclar as mudanças introduzidas por 82, sem as mudanças "
+"anteriores::"
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr "        bzr merge -r 81..82 ../bzr.dev"
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr "    Para aplicar uma mesclagem diretiva contida em  /tmp/merge::"
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr "        bzr merge /tmp/merge"
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revisão com três pais'"
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr "Em vez de mesclar, mostre uma comparação da mesclagem."
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr "Selecione mudanças interativamente."
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+"Mesclagem em ramos vazios não é suportada atualmente, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+"Não é possível usar --uncommitted com empacotamentos ou diretivas mescladas."
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr "Não é possível usar --uncommitted e --revision ao mesmo tempo."
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr "mesclar: "
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr "Nada a ser feito."
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr "Não foi possível obter os arquivos individuais"
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr "Este ramo não tem submissões. (talvez você prefira 'bzr pull')"
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr "Redução de conflito não é suportada para mesclagem de tipo %s."
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr "Nenhum local especificado ou memorizado"
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr "Refazer uma mesclagem."
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+"Use isto se você quer tentar uma técnica de mesclagem diferente para "
+"resolver\n"
+"conflitos. Algumas técnicas de mesclagem são melhores que outras, e "
+"remesclar\n"
+"lhe permite tentar técnicas diferentes em arquivos diferentes."
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+"As opções para remesclar têm o mesmo significado e padrões que aquelas para\n"
+"mesclar. A diferença é que a remesclagem (só) pode ser executada quando há "
+"uma\n"
+"mesclagem pendente, e lhe permite especificar arquivos específicos."
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr "        bzr remerge --show-base"
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr "        bzr remerge --merge-type weave --reprocess foobar"
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr "Reverter arquivos para uma revisão anterior."
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+"Por padrão, quaisquer arquivos que tenham sido manualmente alterados terão "
+"cópias criadas\n"
+"primeiramente. (Arquivos modificados apenas por mesclagem não têm cópias "
+"criadas.) Cópias de arquivos têm\n"
+"'.~#~' concatenado aos seus nomes, onde # é um número."
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr "Não salvar cópias de arquivos revertidos."
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr "Remover marcador de mesclagem pendente, sem alterar nenhum arquivo."
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+"Mostrar a ajuda de um comando ou outro assunto.\n"
+"    "
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr "Mostrar ajuda sobre todos os comandos."
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr "OUTRO_RAMO pode ser local ou remoto."
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr "        bzr missing"
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr "        bzr missing http://server/branch"
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr "        bzr missing -r ..-10"
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr "        bzr missing --my-revision ..-10"
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr "Inverter a ordem das revisões"
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr "Mostrar mudanças somente no ramo local."
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr "O mesmo que --mine-only."
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr "Mostrar alterações somente no ramo remoto."
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr "O mesmo que --theirs-only."
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+"Filtrar em outras revisões de ramo (inclusive). Ver \"help revisionspec\" "
+"para detalhes."
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+"Filtrar em revisões de ramo locais (inclusive). Ver \"help revisionspec\" "
+"para detalhes."
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] "Você tem %d revisão extra:\n"
+msgstr[1] "Você tem %d revisões extras:\n"
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] "Você tem %d revisão pendente:\n"
+msgstr[1] "Você tem %d revisões pendentes:\n"
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr "Esse ramo não tem novas revisões.\n"
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr "Outro ramo não tem novas revisões.\n"
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr "Ramos estão atualizados.\n"
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr "Comprimir os dados em um repositório."
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+"Essa operação comprime dados em um repositório bazaar. Como\n"
+"o bazaar fornece o empacotamento automático de repositório, essa operação\n"
+"normalmente não é necessário ser feita manualmente."
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr "Excluir pacotes obsoletos para economizar espaço em disco."
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr "Lista os plugins instalados."
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+"Este comando exibe a lista dos plugins instalados, incluindo\n"
+"versão do plugin e uma breve descrição de cada."
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr "--verbose mostra o caminho onde cada plugin está localizado."
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+"Um plugin é um componente externo ao Bazaar que amplia o\n"
+"sistema de controle de versão, adicionando ou substituindo código no "
+"Bazaar.\n"
+"Plugins podem fazer uma variedade de ações, incluindo sobrescrever "
+"comandos,\n"
+"adicionar novos comandos, prover uma rede de transporte adicional e\n"
+"personalizar registro de informações."
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr "Mostra a origem de cada linha em um arquivo."
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr "Mostrar anotações em todas as linhas."
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr "Mostrar data de submissão nas anotações."
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+"Sem localização fornecida. Este formato não se lembra de locais antigos."
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr "O ramo já está ligado."
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr "Nenhum local fornecido e nenhuma localização prévia conhecida"
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr "O ramo local náo está associado"
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr "Remover a última revisão submetida."
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr "Na verdade, não fazer alterações."
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr "Diga sim para todas as questões."
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr "A(s) revisão(ões) acima será(ão) removida(s).\n"
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr "Cancelado\n"
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+":Exemplos:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr "Execute o servidor bzr."
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr "protocolo"
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr "Nenhum ramo de submissão especificado ou conhecido"
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr "Nenhum ramo público especificado ou conhecido"
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr "Sem revisões para empacotar."
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr "Enviar o pedido para este endereço."
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr "Corpo para o e-mail."
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr "formato"
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr "Usar o formato de saída especificado."
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr "Cria, remove ou modifica um rótulo nomeando uma versão."
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr "Substituir as tags existentes."
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr "Sem tag especifica para apagar."
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr "Tag %s apagada."
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr "Por favor, especifique o nome da tag."
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr "A tag %s já existe para aquela revisão."
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr "Tag %s criada."
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr "Tag %s atualizada."
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr "Lista de tags."
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+"Este comando mostra uma tabela de nomes de rótulos e as versões que "
+"referenciam."
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr "Ramo em que o rótulo deveria ser exibido."
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr "Ordene rótulos por diferentes critérios."
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr "Uma configuração de destino deve ser especificada."
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr "A relação entre ramo e árvore."
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr "Tipo de repositório"
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr "Local para o repositório."
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr "Reconfigurar para usar um repositório compartilhado."
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr "Árvores no Repositório"
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr "Não é possível usar ambos --stacked-on e --unstacked"
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr "Configuração do alvo não especificada"
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr "Você deve fornecer ou uma versão ou um local"
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr "não é possível criar um ramo sem ramo fonte"
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr "Gerenciar exibições filtradas."
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr "    bzr view file1 dir1 ..."
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr "    bzr view"
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr "    bzr view --delete"
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr "    bzr view --switch off"
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr "    bzr view --name view-name file1 dir1 ..."
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr "    bzr view --name view-name"
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr "    bzr view --name view-name --delete"
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr "    bzr view --switch view-name"
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr "    bzr view --all"
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr "    bzr view --delete --all"
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr "Aplicar ação de listar ou apagar para todas as visões."
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr "Apagar a visão."
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr "Nome da visão para definir, listar ou apagar."
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr "Todas as visões apagadas.\n"
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr "Nenhuma visão vigente para apagar"
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr "Visões definidas:\n"
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr "Nenhuma visão definidas.\n"
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr "Remova um ramo."
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+"Isto irá remover o ramo do local especificado mas \n"
+"manterá qualquer árvore de trabalho ou repositório no lugar."
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr "    bzr remove-branch repo/trunk"
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+"Se uma versão está especificada, mudanças desde aquela versão serão "
+"arquivadas."
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr "    change_editor = PROGRAM @new_path @old_path"
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr "Arquivar todas as mudanças."
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr "escritor"
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr "Lista as mudanças arquivadas."
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr "Destrói mudanças removidas em vez de arquivá-las."
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr "Sem mudanças arquivadas."
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr "Recuperar mudanças arquivadas."
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+":Uso:\n"
+"%s\n"
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ":Uso: %s\n"
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr "Introduzido em: %s"
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+":Exemplos:\n"
+"  Mostra o ID do launchpad do usuário atual::"
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr "      bzr launchpad-login"
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr "  Define um ID do launchpad para o usuário 'bob'::"
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr "      bzr launchpad-login bob"
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr "Não verifique se o nome de usuário é válido."
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr "Nenhum ID de usuário launchpad configurado.\n"
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr "ID de usuário launchpad definido como '%s'.\n"
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr "Em vez de usar::"
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr "  bzr branch ftp://joe:secret@host.com/caminho/para/meu/ramo"
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr "você simplesmente usa::"
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr "  bzr branch ftp://host.com/caminho/para/meu/ramo"
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+"A opção ``--fixes`` permite a você especificar um rastreador de bug e um "
+"identificador de bug\n"
+"em vez de uma URL completa. Isso parece::"
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr "    bzr commit --fixes <tracker>:<id>"
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr "ou::"
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr "    bzr commit --fixes <id>"
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+"Launchpad\n"
+"---------"
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+"Definições de configuração\n"
+"======================="
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+"Configurações de ambiente\n"
+"---------------------"
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr "  \"John Doe <jdoe@exemplo.com>\""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+"BZR_HOME\n"
+"~~~~~~~~"
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+"BZR_SSH\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+"BZR_PDB\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+"BZR_LOG\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+"Exemplo:\n"
+"~~~~~~~~"
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+"BZRPATH\n"
+"~~~~~~~"
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+"\n"
+"Arquivos de configuração\n"
+"-------------------"
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+"Localização\n"
+"~~~~~~~~"
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+"Comentários\n"
+"^^^^^^^^"
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr "    [DEFAULT]"
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+"email\n"
+"~~~~~"
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+"editor\n"
+"~~~~~~"
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+"mail_client\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+"push_strict\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+"Isso acontece quando um lado adicionou arquivos para um diretório, e o outro "
+"lado\n"
+"foi alterado o diretório em arquivo ou link simbólico. Por exemplo::"
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+"Para resolver esse tipo de conflito, você tem que decidir o nome deve ser\n"
+"mantido para o arquivo, diretório, ou link simbólico envolvidos."
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+"* ``--action=take-this`` emitirá ``bzr rm --force foo.new`` e \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` emitirá ``bzr rm --force foo`` e \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` apenas marcará o conflito como resolvido."
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+"Para generalizar, existem dois formatos de conteúdo suportados pelo Bazaar:"
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+"* Um formato canonical - como os arquivos são armazenados internamente.\n"
+"* Um formato conveniente - como os arquivos são criados em uma árvore de "
+"diretório."
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr "Introduzido em: 2.2"
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr "Introduzido em: 1.8"
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr "Introduzido em: 1.4"
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+"post_commit\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr "Introduzido em: 0.15"
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+"post_pull\n"
+"~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+"post_push\n"
+"~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+"post_switch\n"
+"~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr "Introduzido em: 1.6"
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+"pre_commit\n"
+"~~~~~~~~~~"
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr "Introduzido em: 0.91"
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr "Introduzido em: 1.9"
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr "Introduzido em: 1.13"
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr "Introduzido em: 1.17"
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr "Introduzido em: 2.4"
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr "Introduzido em: 1.14"
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr "Introduzido em: 1.15.0"
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr "Introduzido em: 2.1"
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr "Introduzido em: 2.5"
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr "Introduzido em: 1.15.0"
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr "Introduzido em: 1.10"
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr "Introduzido em: 2.0"
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr "Introduzido em: desconhecido"
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr "Introduzido em: 0.16"
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr "Introduzido em: 2.3"
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr "Outros formatos de armazenamento"
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr "Formatos experimentais são mostrados abaixo."
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+"\n"
+"Formatos obsoletos são mostrados abaixo."
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr "    Exemplos::"
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr "      $ bzr diff -r submit:"
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ":ramo:"
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+"    Fornecer o caminho de um ramo para selecionar sua última revisão."
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr "      branch:/caminho/para/ramo"
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ":tag:"
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr "    Tags são armazenadas no ramo e criadas pelo comando 'tag'."
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ":revno:"
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+"Regras\n"
+"====="
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+"Arquivos\n"
+"-----"
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr "Bazaar permite locais serem especificados de várias maneiras, seja:"
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr " * URLs completamente definidas"
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr " * Caminhos do sistema de arquivos, absolutos ou relativos"
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr "Estes são válidos, mas não se referem ao mesmo arquivo::"
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr "Identificadores de URL"
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr "Prefixos de URL suportados::"
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+"  aftp:// Acessa usando FTP ativo.\n"
+"  bzr:// Acesso rápido usando o bazaar smart server.\n"
+"  bzr+ssh:// Acesso rápido usando o Bazaar smart sobre SSH.\n"
+"  file:// Acesso usando o sistema de arquivos (padrão)\n"
+"  ftp:// Acesso usando FTP passivo.\n"
+"  http:// Acesso somente leitura de ramos exportados na web.\n"
+"  https:// Acesso somente leitura de ramos exportados na web usando SSL.\n"
+"  sftp:// Acesso usando SFTP (a maioria dos servidores SSH fornecem acesso "
+"SFTP)."
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr "Modificadores suportados::"
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr "  <protocolo>://[usuário[:senha]@]servidor[:porta]/[diretório]"
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr "permitindo URLs, tais como::"
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+"Para URLs bzr+ssh:// e sftp://, Bazaar também suporta caminhos que começam\n"
+"com '~' significando que o resto do caminho deve ser interpretado\n"
+"relativamente ao diretório home do usuário. Por exemplo, se o usuário\n"
+"``remoto`` tem como diretório home  ``/home/remoto`` no servidor\n"
+"shell.example.com, então::"
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr "refere-se a ``/home/remote/myproject/trunk``."
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
+"Diversos comandos que aceitam URLs também aceitam pseudônimos de "
+"localização.\n"
+"Veja :doc:`location-alias-help` e :doc:`url-special-chars-help`.\n"
diff --git a/po/ro.po b/po/ro.po
new file mode 100644
index 0000000..651378e
--- /dev/null
+++ b/po/ro.po
@@ -0,0 +1,13238 @@
+# Romanian translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
+"== 0) && (n != 0))) ? 2: 1));\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:20+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 0000000..d3f6de5
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,13864 @@
+# Russian translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:20+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr "пропуск {0} (более, чем {1} из {2} байт)"
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr "Извлечение из стека"
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr "Отправлено до ревизии %d включительно."
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] "%d тег обновлён."
+msgstr[1] "%d тега обновлено."
+msgstr[2] "%d тегов обновлено."
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr "Нет новых ревизий или тегов для отправки."
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr "Нет новых ревизий для отправки."
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr "проверена ветвь {0} формата {1}"
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "обнаружена ошибка:%s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr "Игнорируются файлы вне окна просмотра. Окно просмотра: %s"
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr "bzr %s --revision принимает ровно один идентификатор ревизии"
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr "Отобразить краткое описание состояния."
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"Эта команда сообщает о файлах с версиями и неизвестных файлах,\n"
+"группируя их по состоянию.  Возможные состояния:"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+"добавлены\n"
+"    Имеют версию в рабочей копии, но отсутствуют в предыдущей\n"
+"    ревизии."
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+"исключены\n"
+"    Имеют версию в предыдущей ревизии но исключены или удалены\n"
+"    в рабочей копии."
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+"переименованы\n"
+"    Путь к этим файлам изменился с предыдущей ревизии;\n"
+"    текст также мог измениться.  Это состояние включает\n"
+"    файлы, родительская директория которых была переименована."
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+"изменены\n"
+"    Текст изменился с предыдущей ревизии."
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+"изменили вид\n"
+"    Вид файла изменился (например, файл стал директорией)."
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+"неизвестны\n"
+"    Не имеют версии и не подходят под шаблон игнориируемых файлов."
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+"Кроме этого, для директорий, символьных ссылок и файлов, бит\n"
+"выполнения которых изменился, Bazaar показывает их тип, добавляя\n"
+"в конец имени символы: '/', '@' или '*' соответственно. Эти\n"
+"декорации можно убрать, используя опцию '--no-classify'."
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+"Чтобы просмотреть игнорируемые файлы, используйте 'bzr ignored'.\n"
+"Изменения текста файлов можно увидеть, используя 'bzr diff'."
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+"Заметьте, что опция --short или -S даёт вывод статусных флагов,\n"
+"подобный команде Subversion status. Чтобы получить вывод, похожий\n"
+"на svn -q, используйте bzr status -SV."
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+"Если не указано аргументов, выводится состояние всей рабочей директории.\n"
+"Иначе, выводится только статус указанных файлов или директорий.\n"
+"Если указана директория, то выводится состояние всех файлов внутри\n"
+"этой директории."
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+"Перед закреплением слияний, отображаются необработанные ревизии.\n"
+"Чтобы увидеть все ревизии слияния, используйте опцию -v.\n"
+"Чтобы полностью пропустить отображение информации о слиянии,\n"
+"используйте опцию no-pending либо укажите файл или директорию."
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+"Чтобы сравнить рабочую копию с определённой ревизией, укажите\n"
+"ревизию в соответствующем аргументе."
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+"Чтобы увидеть, какие файлы изменились в определённой ревизии, или\n"
+"между двумя ревизиями, укажите в аргументе ревизии интервал.\n"
+"Это даёт такой же результат, как вызов 'bzr diff --summarize'."
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr "Использовать короткие статусные пометки."
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr "Показывать только файлы, имеющие версию."
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr "Не показывать необработанные слияния."
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr "Не помечать типы объектов суффиксами."
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+"bzr status --revision принимает ровно один или два идентификатора ревизии"
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr "Вы можете указать только одно из revision_id или --revision"
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr "Вы должны предоставить --revision или revision_id"
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr "Репозиторий %r не поддерживает прямой доступ к текстам ревизий"
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr "Репозиторий {0} не содержит ревизии {1}."
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr "Вы не можете указать ревизию NULL."
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr "Удалить рабочее дерево из данной ветви или рабочей копии."
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+"Поскольку легковесная рабочая копия, это нечто большее, чем рабочее\n"
+"дерево, эту команду нельзя выполнить внутри неё."
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr "Чтобы воссоздать рабочее дерево, используйте «bzr checkout»."
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+"Удалить рабочее дерево даже, если оно содержит незакреплённые или отложенные "
+"изменения."
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr "Нет рабочего дерева для удаления"
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr "Вы не можете удалить внешнее рабочее дерево"
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr "Вы не можете удалить рабочее дерево из легковесной рабочей копии"
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+"Дерево не повреждено. Возможно, вы хотели выполнить «bzr revert». "
+"Используйте «--force», если вы уверены, что хотите использовать reset."
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+", заголовок повреждён, попробуйте использовать аргумент -r -1, чтобы "
+"сбросить состояние до предыдущего закрепления"
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr "не удалось сбросить состояние дерева {0}"
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr "Показать номер текущей ревизии."
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr "Это эквивалентно числу ревизий в этой ветви."
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr "--tree и --revision не могут использоваться вместе"
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr "Тегом можно пометить только отдельную ревизию, не интервал"
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr "Показать номер ревизии рабочего дерева."
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr "Добавить указанные файлы или директории."
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+"В нерекурсивном режиме, все указанные элементы добавляются, вне\n"
+"зависимости от того, игнорировались ли они до этого.  Выводится\n"
+"предупреждение, если какие-либо из указанных элементов уже были\n"
+"под контролем Bazaar."
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+"В рекурсивном режиме (по умолчанию), файлы обрабатываются точно\n"
+"также, но для директорий применяется другой алгоритм.  Для\n"
+"директорий, которые уже имели версию, предупреждение не выводится.\n"
+"Во всех директориях, независимо от того, находятся они под контролем\n"
+"системы контроля версий или нет, производится поиск файлов, которые\n"
+"не имеют версии и не игнорируются, и эти файлы добавляются.\n"
+"Этот поиск входит рекурсивно в директории, имеющие версию.\n"
+"Если не указано ни одного имени, предполагается '.'."
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+"Предупреждение будет напечатано для каждого встреченного вложенного\n"
+"дерева, если только оно не игнорируется явно."
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+"Следовательно, просто вызов 'bzr add' добавит к системе контроля\n"
+"версий все файлы, которые ей неизвестны."
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+"Добавление файла, родительская директория которого не имеет версии\n"
+"неявно добавляет родителя и так далее до корня. Это означает, что\n"
+"вам никогда не нужно явно добавлять директорию, они добавляются\n"
+"автоматически, когда вы добавляете файлы."
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+"--dry-run покажет, какие файлы будут добавлены, но не будет их\n"
+"добавлять."
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+"--file-ids-from попытается использовать идентификаторы файлов из\n"
+"предоставленного пути. С этой опцией просматриваются идентификаторы\n"
+"в попытке найти соответствующую родительскую директорию с тем же\n"
+"именем, а затем полный путь. Эта опция редко необходима, но может\n"
+"быть полезна при добавлении одного и того же логического файла к\n"
+"двум различным ветвям, которые затем будут совмещены (при этом\n"
+"добавления в обе ветви не будут рассматриваться как конфликты).\n"
+"Это также полезно при помещении другого проекта, как поддиректории\n"
+"данного."
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+"Любые файлы, удовлетворяющие шаблонам в списке ignore не будут\n"
+"добавлены, если их не указать явно."
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+"В рекурсивном режиме, файлы больше, чем опция конфигурации\n"
+"add.maximum_file_size, будут пропущены. Явно названные элементы\n"
+"никогда не будут пропущены по этому критерию."
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr "Не добавлять содержимое директорий рекурсивно."
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr "Искать идентификаторы в этом дереве."
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr "пропуск {0} из-за условия «{1}»\n"
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr "Создать новую директорию в системе версий."
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr "Это эквивалентно созданию директории и её добавлению."
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+"Не выводить ошибку, если существует, создавать родительские директории при "
+"необходимости."
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr "добавлен %s\n"
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr "указан неизвестный вид %r"
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr "Переместить или переименовать файл."
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr "    bzr mv ИСТОЧНИК... НАЗНАЧЕНИЕ"
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+"Если последний аргумент является директорией под контролем Bazaar,\n"
+"все остальные имена перемещаются в неё.  Иначе, должно быть указано\n"
+"ровно два аргумента, и файл переименовывается."
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+"Если СТАРОЕИМЯ не существует в файловой системе, но есть в системе\n"
+"версий, а НОВОЕИМЯ существует, но отсутствует в системе версий, mv\n"
+"предполагает, что файл был перемещён вручную и только обновляет\n"
+"свои внутренние структуры, чтобы отразить это изменение.\n"
+"Тоже верно и при перемещении многих ИСТОЧНИКов в НАЗНАЧЕНИЕ."
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr "Файлы нельзя перемещать между ветвями."
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+"Переместить только bzr-идентификатор файла, поскольку сам файл уже был "
+"перемещён."
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr "Автоматически предполагать переименования."
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr "Избегать изменений при угадывании переименований."
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr "--dry-run требует --auto."
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr "отсутствует аргумент файл"
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr "нельзя переместить корень ветви"
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr "Только один путь может быть указан, как аргумент --auto."
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr "--after не может использоваться вместе с --auto."
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+"чтобы переместить несколько файлов, назначение должно быть директорией под "
+"контролем системы версий"
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr "Преобразовать эту ветвь в зеркало другой ветви."
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+"По умолчанию, эта команда работает только на ветвях, которые не являются\n"
+"отклонениями. Ветвь считается отклонением, если последнее закрепление в\n"
+"ветви назначения не было совмещено (явно или неявно) с родителем."
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+"Если ветвь является отклонением, можно использовать 'bzr merge' для\n"
+"возвращения изменений.  После совмещения ветвей, можно снова принимать\n"
+"изменения из одной в другую."
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+"Если вы хотите затереть ваши локальные изменения, чтобы ветвь совпадала\n"
+"с удалённой, используйте pull --overwrite.  Это будет работать, даже если\n"
+"ветвь является отклонением."
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+"Если местоположение по умолчанию не установлено, первый pull установит\n"
+"его (используйте --no-remember, чтобы избежать этой установки).  После\n"
+"этого, вы можете опускать местоположение, чтобы использовать значение\n"
+"по умолчанию.  Чтобы изменить значение по умолчанию, используйте опцию\n"
+"--remember.  Значение будет сохранено, только если доступ к удалённому\n"
+"местоположению будет успешен."
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+"Опция --verbose отобразит ревизии, загруженные с использованием опции\n"
+"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"
+"её опцией -Olog_format=<другой_формат>."
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+"Замечание: Местоположение можно указывать как в форме ветви, так и в\n"
+"форме пути к файлу, содержащему директиву слияния, созданному bzr send."
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr "Показать журналы принятых ревизий."
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+"Принимать изменения в эту ветвь, а не в содержащую рабочую директорию."
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+"Сделать локальный приём в связанную ветвь. Локальный приём не накладывается "
+"на основную ветвь."
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr "Для --show-base необходимо рабочее дерево."
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr "Местоположение для приёма неизвестно и не указано."
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr "Используется сохранённое местоположение родителя: %s\n"
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr "Нельзя использовать -r с директивами слияния или пакетами"
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr "Обновить зеркало этой ветви."
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+"Целевая ветвь не будет иметь рабочего дерева, поскольку это накладно\n"
+"и не поддерживается удалёнными файловыми системами."
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+"Некоторые умные серверы или протоколы *может быть* будут размещать\n"
+"рабочее дерево в месте назначения в будущем."
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+"Эта команда работает только на ветвях, которые не являются\n"
+"отклонениями. Ветвь считается отклонением, если последнее\n"
+"закрепление в ветви назначения не было совмещено (явно или\n"
+"неявно) с родителем."
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+"Если ветвь была отклонена, вы можете использовать 'bzr push --overwrite',\n"
+"чтобы полностью заменить другую ветвь, убирая все её несовмещённые\n"
+"изменения."
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+"Если вы хотите убедиться, что у вас иные изменения, чем в другой ветви,\n"
+"сделайте слияние (см. bzr help merge) с другой ветвью, и закрепите эти\n"
+"изменения. После этого вы сможете делать push без необходимости указывать\n"
+"опцию '--overwrite'."
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+"Если местоположение отправки по умолчанию не установлено, первый push\n"
+"установит её (используйте --no-remember, чтобы не устанавливать).\n"
+"После этого вы можете опускать местоположение, чтобы использовать\n"
+"значение по умолчанию.  Чтобы изменить значение по умолчанию,\n"
+"используйте опцию --remember.  Значение будет сохранено, только если\n"
+"доступ к удалённой локации будет успешен."
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+"Опция --verbose отобразит ревизии, выгруженные с использованием опции\n"
+"конфигурации log_format. Вы можете использовать другой формат, перегрузив\n"
+"её опцией -Olog_format=<другой_формат>."
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr "Отправлять из этой ветви, а не из содержащей рабочую директорию."
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+"По умолчанию, push закончится неудачей, если директория назначения "
+"существует, но не содержит управляющих метаданных. Этот флаг позволит "
+"отправке изменений продолжаться."
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+"Создать стековую ветвь, которая ссылается на публичное местоположение "
+"родительской ветви."
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+"Создать стековую ветвь, которая ссылается на другую ветвь для хранения "
+"истории фиксаций. В созданную ветвь помещается только работа, не "
+"существующая в исходной ветви."
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+"Отказывать в отсылке изменений, если в рабочем дереве есть незакреплённые "
+"изменения, --no-strict запрещает проверку."
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+"Не создавать рабочее дерево, даже для протоколов, которые поддерживают это."
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr "Не удалось определить ветвь, на которую нужно ссылаться."
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr "Местоположение для отсылки изменений неизвестно и не указано."
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr "Используется сохранённое местоположение отсылки: %s"
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr "Создать новую ветвь, являющуюся копией существующей ветви."
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+"Если TO_LOCATION опущено, будет использована последняя компонента\n"
+"FROM_LOCATION. Иными словами, «branch ../foo/bar» попытается создать ./bar.\n"
+"Если FROM_LOCATION не содержит разделителя «/», то TO_LOCATION определется\n"
+"из FROM_LOCATION удалением префикса. Например «branch lp:foo-bar»\n"
+"попытается создать ./foo-bar."
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+"Чтобы получить определённую ревизию ветви, передайте её в параметре\n"
+"--revision, напр. «branch foo/bar -r 5»."
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr "Синонимы 'clone' и 'get' для этой команды устарели."
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr "Создать ветвь без рабочего дерева."
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr "Заменить рабочую копию в текущей директории новой ветвью."
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+"Создать стековую ветвь, ссылающуюся на исходную ветвь. Все операции над "
+"новой ветвью будут зависеть от доступности старой ветви."
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr "Не использовать общий репозиторий, даже если доступен."
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+"По умолчанию branch завершится неудачей, если директория назначения "
+"существует, но не содержит управляющих метаданных. Этот флаг позволит branch "
+"продолжаться."
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr "Связать новую ветвь с FROM_LOCATION"
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr "Целевая директория «%s» уже существует."
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr "Родитель «%s» не существует."
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr "В ветви {0} отсутствует ревизия {1}."
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr "Создана новая стековая ветвь, ссылающаяся на %s."
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] "Ответвлена %d ревизия."
+msgstr[1] "Ответвлены %d ревизии."
+msgstr[2] "Ответвлены %d ревизий."
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr "Новая ветвь, связанная с %s"
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr "Переключение на ветвь: %s"
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr "Вывести список ветвей, доступных в текущем местоположении."
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr "Эта команда выведет имена всех ветвей в текущем местоположении."
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+"Рекурсивно сканировать ветви, а не смотреть в указанном местоположении."
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr "(по умолчанию)"
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr "Создать новую рабочую копию текущей ветви."
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+"Если аргумент BRANCH_LOCATION опущен, checkout воссоздаст рабочее дерево\n"
+"для ветви, найденной в '.'. Это полезно, если вы удалили рабочее дерево,\n"
+"или если вы никогда не создавали его."
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+"Если TO_LOCATION опущено, будет использована последняя компонента\n"
+"BRANCH_LOCATION. Иными словами, «checkout ../foo/bar» попытается\n"
+"создать ./bar. Если BRANCH_LOCATION не содержит разделителя «/»,\n"
+"то TO_LOCATION определется из BRANCH_LOCATION удалением префикса.\n"
+"Например «checkout lp:foo-bar» попытается создать ./foo-bar."
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+"Чтобы получить определённую ревизию ветви, добавьте параметр --revision,\n"
+"например «checkout foo/bar -r 5». Заметьте, что такое дерево будет сразу\n"
+"просрочено [так что в не сможете закрепить изменения], но это может быть\n"
+"полезно, к примеру, для просмотра старого кода."
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+"Получить легковесную рабочую копию. Каждая операция над легковесной рабочей "
+"копией зависит от доступности ветви. Обычные рабочие копии позволяют "
+"производить стандартные операции, как diff и status, без такого доступа, а "
+"также поддерживают локальные закрепления."
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr "Получить содержимое файла из этого дерева."
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr "Использовать жёсткие ссылки в рабочем дереве, когда это возможно."
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+"Показать список переименованных файлов.\n"
+"    "
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr "Обновить рабочее дерево до новой ревизии."
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+"Нельзя обновить только отдельный файл или директорию, поскольку каждое\n"
+"рабочее дерево Bazaar имеет только одну базовую ревизию.  Если вы хотите\n"
+"восстановить файл, который был удалён на локальной машине, используйте\n"
+"'bzr revert', а не 'bzr update'.  Если вы хотите восстановить файл до\n"
+"состояния в предыдущей ревизии, используйте 'bzr revert' с опцией '-r',\n"
+"или используйте 'bzr cat', чтобы записать старое содержимое этого файла\n"
+"в новое местоположение."
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr "bzr update --revision принимает ровно одну ревизию"
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+"bzr update может обновить только всё дерево, не файл или поддиректорию"
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr "Дерево в актуальной ревизии {0} ветви {1}"
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+"в ветви нет ревизии %s\n"
+"bzr update --revision работает только для ревизий в истории ветви"
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr "Обновлено до ревизии {0} ветви {1}"
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+"Ваши локальные закрепления теперь будут отображаться в 'bzr status' как "
+"незавершённые слияния, и их можно закрепить с помощью 'bzr commit'."
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr "Показать информацию о рабочем дереве, ветви или репозитории."
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+"Эта команда выведет все известные местоположения и форматы, связанные\n"
+"с деревом, ветвью или репозиторием."
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+"В подробном режиме в каждый отчёт включается статистическая информация.\n"
+"Чтобы увидеть расширенную статистическую информацию, используйте уровень\n"
+"подробностей 2 или выше, указывая опцию -v несколько раз, например -vv."
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+"Ветви и рабочие деревья также включают в отчёт отсутствующие ревизии."
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ":Примеры:"
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr "  Вывести информацию о формате и связанных местоположениях:"
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr "    bzr info"
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+"  Вывести то же, что и выше, а также расширенную информацию о формате\n"
+"  и базовую статистику (как число файлов в рабочем дереве и число\n"
+"  ревизий в ветви и репозитории):"
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr "    bzr info -v"
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr "  Вывести то же, что и выше, а также число участников ветви:"
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr "    bzr info -vv"
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr "Исключить файлы или директории."
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+"Прекращает отслеживание изменений в указанных файлах. Bazaar удалит их,\n"
+"если их можно легко восстановить с помощью revert, иначе будут созданы\n"
+"их резервные копии (с расширением вида .~#~). Если не указано ни опций,\n"
+"ни параметров, Bazaar найдёт файлы, которые отслеживаются, но отсутствуют\n"
+"в рабочем дереве и прекратит их отслеживать."
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr "Исключать только файлы, которые никогда не были закреплены."
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr "Используемый способ удаления файлов."
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr "Стратегия удаления"
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr "Удалить из bzr, но оставить рабочую копию."
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr "Не создавать резервные копии изменённых файлов."
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+"Удалить все указанные файлы, даже если их нельзя восстановить или они "
+"являются непустыми директориями. (устарело, используйте no-backup)"
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+"(Опция --force устарела, в будущем следует использовать --no-backup.)"
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr "Нет файлов, удовлетворяющих критерию."
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr "Согласовать метаданные bzr в ветви."
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+"Может исправить несовпадения данных, вызванные обновлениями bzr.\n"
+"Эту команду стоит запускать только, если 'bzr check' или разработчик\n"
+"bzr предложат вам сделать это."
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+"Если предоставлена вторая ветвь, производится попытка согласования\n"
+"между ветвями, в ходе которой проверяется, что данные, не\n"
+"присутствовавшие в ранних версиях bzr, корректно представлены\n"
+"в обоих ветвях."
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+"В то же время, при запуске возможно пережатие данных, потенциально\n"
+"уменьшающее размер занимаемого пространства и повышающее\n"
+"производительность."
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+"Ветвь *ДОЛЖНА* быть на системе, поддерживающей список файлов, такой как\r\n"
+"локальный диск или SFTP."
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr "Преобразовать директорию в ветвь системы контроля версий."
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+"Используйте эту команду для создания пустой ветви или\n"
+"перед импортом существующего проекта."
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+"Если в родительской директории находится репозиторий, история ветви\n"
+"будет сохранена в репозитории. Иначе, init создаёт одиночную ветвь,\n"
+"которая несёт историю с собой в директории .bzr."
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+"Если ветвь уже существует, но рабочее дерево отсутствует, то оно\n"
+"создаётся с помощью 'bzr checkout'."
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr "Рецепт для импорта дерева файлов::"
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"проект импортирован\""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr "Создать путь, ведущий к ветви, если он ещё не существует."
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr "Указать формат данной ветви. См. «help formats»."
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+"Никогда не изменять номера ревизий в существующем журнале. Только добавлять "
+"к нему ревизии."
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr "Создать ветвь без рабочего дерева."
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+"Родительская директория для %s не существует.\n"
+"Вы может предоставить --create-prefix, чтобы создать все родительские "
+"директории."
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+"Формат этой ветви не может быть установлен в append-revisions-only. "
+"Попробуйте --default."
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr "Создана {0} в формате {1}\n"
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr "Используется общий репозиторий: %s\n"
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+"Создать общий репозиторий для ветвей, которые разделяют общее пространство."
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+"Новые ветви, создаваемые в директории репозитория, будут хранить\n"
+"информацию о ревизиях в репозитории, а не в директории ветви.\n"
+"Для ветвей с общей историей это уменьшает размер необходимого\n"
+"пространства и ускоряет создание новых ветвей."
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+"Если дана опция --no-trees, то по умолчанию ветви в репозитории не\n"
+"будут иметь рабочих деревьев.  Они по прежнему будут существовать,\n"
+"как директории на диске, но не будут иметь различных копий файлов\n"
+"определённой ревизии.  Это может быть полезно для репозиториев,\n"
+"хранящих ветви, работа с которыми производится через рабочие копии\n"
+"или через удалённые ветви, например на сервере."
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+":Примеры:\n"
+"    Создать общий репозиторий, хранящий только ветви::"
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr "    Создать легковесную рабочую копию где-нибудь ещё::"
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (здесь добавляйте файлы)"
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+"Указать формат для этого репозитория. Описание форматов см. в «bzr help "
+"formats»."
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr "Формат репозитория"
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr "Ветви в репозитории по умолчанию не будут иметь рабочего дерева."
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr "Показать изменения в рабочем дереве, между ревизиями или ветвями."
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+"Если не дано аргументов, будут выведены все изменения текущего дерева.\n"
+"Если даны файлы, выводятся изменения только в этих файлах. Удалённые\n"
+"или множественные ветви можно сравнить, используя опции --old и --new.\n"
+"Если не указаны, значение по умолчанию для обоих извлекается из первого\n"
+"аргумента или из текущего дерева, если не дано аргументов."
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+"«bzr diff -p1» эквивалентно «bzr diff -prefix old/:new/», и\n"
+"создаёт патчи, подходящие для «patch -p1»."
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+"Заметьте, что при использовании аргумента -r с интервалом ревизий,\n"
+"различия вычисляются между указанными ревизиями.  То есть, команда\n"
+"не показывает изменения, представленные в первой ревизии интервала.\n"
+"Это отличается от интерпретации интервалов ревизий командой «bzr log»,\n"
+"которая включает первую ревизию интервала."
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+":Значения выхода:\n"
+"    1 - изменено\n"
+"    2 - непредставимые изменения\n"
+"    3 - ошибка\n"
+"    0 - нет изменений"
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+":Примеры:\n"
+"    Показывает отличия рабочего дерева от последнего закрепления::"
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr "        bzr diff"
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr "    Различия между рабочим деревом и ревизией 1::"
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr "        bzr diff -r1"
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr "    Различия между ревизией 3 и ревизией 1::"
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr "        bzr diff -r1..3"
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr "    Различия между ревизией 3 и ревизией 1 для ветви xxx::"
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr "        bzr diff -r1..3 xxx"
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr "    Изменения, представленные в ревизии 2 (эквивалентно -r1..2)::"
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr "        bzr diff -c2"
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+"    Чтобы увидеть изменения, представленные в ревизии X::\n"
+"    \n"
+"        bzr diff -cX"
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+"    Заметьте, что в случае слияния, опция -c выведет только изменения\n"
+"    относительно левого родителя.  Чтобы увидеть изменения относительно\n"
+"    правого родителя, используйте::"
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr "        bzr diff -r<выбранный_родитель>..X"
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+"    Изменения между текущей ревизией и предыдущей\n"
+"    (эквивалент -c-1 и -r-2..-1)"
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr "        bzr diff -r-2.."
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr "    Показать изменения только для файла NEWS::"
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr "        bzr diff NEWS"
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr "    Показать изменения в рабочем дереве xxx для файла NEWS::"
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr "        bzr diff xxx/NEWS"
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr "    Показать изменения рабочего дерева относительно ветви xxx:"
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr "        bzr diff --old xxx"
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr "    Показать различия в файле NEWS между двумя ветвями::"
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr "        bzr diff --old xxx --new yyy NEWS"
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr "    Тоже, что и 'bzr diff', но начать пути с old/ и new/::"
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Показать изменения, используя пользовательскую программу diff с "
+"опциями::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr "Передать эти опции внешней программе diff."
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+"Установить префиксы, добавляемые к старым и новым именам файлов, как "
+"значения, разделённые двоеточием (напр. «old/:new/»)."
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr "Ветвь или дерево, которое сравнивать."
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr "Ветвь или дерево, с которым сравнивать."
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr "Использовать эту команду для сравнения."
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr "Используемый формат diff."
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr "Формат diff"
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+"--prefix ожидает два значения, разделённые двоеточием (напр. «old/:new/»)"
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr "bzr diff --revision принимает ровно ожин или два аргумента"
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr "{0} и {1} взаимоисключающи"
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+"Вывести список файлов, удалённых в рабочем дереве.\n"
+"    "
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr "Показать корневую директорию дерева."
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+"Корень это ближайшая родительская директория с управляющей\n"
+"директорией .bzr."
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr "Аргумент предела должен быть целым числом."
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr "Аргументы пределов должны быть целыми числами."
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr "Показать журнал истории ветви или подмножества ветви."
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+"log — это утилита bzr по умолчанию для просмотра истории ветви.\n"
+"Используемая ветвь определяется первым параметром. Если не задано\n"
+"параметров, выводится журнал ветви, содержащей рабочюю директорию.\n"
+"Вот несколько простых примеров::"
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+"  bzr log                       журнал текущей ветви\n"
+"  bzr log foo.py                журнал файла в его ветви\n"
+"  bzr log http://server/branch  журнал ветви на сервере"
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+"Фильтрация, сортировка и отображение информации для каждой ревизии\n"
+"могут управляться, как объяснено ниже.  По умолчанию, выводятся все\n"
+"ревизии отсортированные так, что более новые ревизии находятся выше\n"
+"более старых и потомки находятся выше предков.  Если ревизия слияния\n"
+"отображаются, то они отображаются с отступом, относительно ревизии,\n"
+"в которой происходило слияние."
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ":Управление выводом:"
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+"  Формат журнала определяет, как отображается информация о каждой\n"
+"  ревизии.  Стандартные форматы журнала называются «long», «short»\n"
+"  и «line». По умолчание используется long. Подробности о форматах\n"
+"  смотрите в «bzr help log-formats»."
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+"  Следующие опции могут использоваться для управления отображением\n"
+"  информации::"
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+"    -l N        выводить не больше N ревизий\n"
+"    -n N        выводить N уровней ревизий (0 для всех, 1 для сжатого)\n"
+"    -v          выводить статусные сообщения (delta) для каждой ревизии\n"
+"    -p          выводить различия diff для каждой ревизии\n"
+"    --show-ids  выводить id ревизий (и id файлов), не только номера ревизий"
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+"  Число уровней отображения по умолчанию зависит от формата журнала.\n"
+"  Если используется не опция -n, стандартные форматы журнала показывают\n"
+"  верхний уровень (основную линию)."
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+"  Описания статусов отображаются с помощью флагов A, M, и т.д. Чтобы\n"
+"  увидеть изменения, описанные словами вроде «добавлены» и «изменены»,\n"
+"  используйте опцию -vv."
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ":Управление порядком:"
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+"  Чтобы вывести ревизии от старой до новой, используйте опцию --forward.\n"
+"  В большинстве случаев, при использовании этой опции на создание журнала\n"
+"  расходуется мало времени, хотя --forward не выводит ревизии по порядку,\n"
+"  как это делает --reverse."
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ":Фильтрация ревизий:"
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+"  Опцию -r можно использовать для указания ревизии или интервала ревизий\n"
+"  для фильтрации. Различные формы показаны ниже::"
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+"    -rX      вывести ревизию X\n"
+"    -rX..    вывести ревизию X и более поздние\n"
+"    -r..Y    вывести до и включая ревизию Y\n"
+"    -rX..Y   вывести от X до Y включительно"
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+"  Чтобы узнать, как указывать X и Y, смотрите «bzr help revisionspec».\n"
+"  Ниже приведеные некоторые распространённые примеры::"
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+"    -r-1                показать только верхушку\n"
+"    -r-10..             показать последние 10 ревизий основной линии\n"
+"    -rsubmit:..         показать, что нового в этой ветви\n"
+"    -rancestor:путь..   показать изменения, начиная с общего предка\n"
+"                        этой ветви и указанной в пути\n"
+"    -rdate:yesterday..  показать изменения со вчерашнего дня"
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ":Фильтрация пути:"
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+"  Если заданы параметры и первый не является ветвью, будут отображаться\n"
+"  только те ревизии, которые изменяли указанные файлы или директории."
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+"  Имена файлов интерпретируются в историческом контексте. Чтобы вывести\n"
+"  журнал для удалённого файла, укажите такой интервал ревизий, что файл\n"
+"  существует от начала до конца интервала."
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+"  Исторический контекст также важен при интерпретации путей\n"
+"  переименованных файлов и директорий. Рассмотрим следующий пример:"
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+"  * ревизия 1: добавлен tutorial.txt\n"
+"  * ревизия 2: изменён tutorial.txt\n"
+"  * ревизия 3: переименован tutorial.txt в guide.txt; добавлен tutorial.txt"
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr "  В этом случае:"
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+"  * «bzr log guide.txt» выведет журнал файла, добавленного в ревизии 1"
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+"  * «bzr log tutorial.txt» выведет журнал нового файла, добавленного\r\n"
+"    в ревизии 3"
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+"  * «bzr log -r2 -p tutorial.txt» выведет изменения оригинального\n"
+"    файла в ревизии 2."
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+"  * «bzr log -r2 -p guide.txt» выведет сообщение об ошибке, так как\n"
+"    в ревизии 2 нет файла guide.txt."
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ":Другая фильтрация:"
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+"  Опцию --match можно использовать для нахождения ревизий, удовлетворяющих\n"
+"  регулярному выражению в сообщении, закрепляющем, авторе или ошибке.\n"
+"  Опцию можно указать несколько раз и в этом случае будут выведены только\n"
+"  ревизии, удовлетворяющие всем критериям. Для поиска по определённым\n"
+"  полям можно использовать опции --match-author, --match-bugs,\n"
+"  --match-committer и --match-message."
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ":Советы и трюки:"
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+"  Чаще лучше просматривать историю с помощью графических утилит и IDE,\n"
+"  например qlog, viz из qbzr или bzr-gtk, оболочку bzr-explorer, или\n"
+"  веб-интерфейс Loggerhead. Смотрите руководство по модулям\n"
+"  <http://doc.bazaar.canonical.com/plugins/en/> и\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+"  Возможно, вы захотите добавить следующие псевдонимы в «bazaar.conf»::"
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+"  Тогда «bzr tip» выведет последнюю ревизию, а «bzr top» — последние\n"
+"  10 ревизий основной линии. Чтобы просмотреть журнал определённой\n"
+"  ревизии X, используйте «bzr show -rX»."
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+"  Если вы хотите подробно рассмотреть определённое слияние X,\n"
+"  используйте «bzr log -n0 -rX»."
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+"  «bzr log -v» на ветви с большой историей на данный момент работает\n"
+"  очень медленно. Сейчас ведётся работа над исправлением этого\n"
+"  недостатка. Независимо от того, будет это исправлено или нет,\n"
+"  рекомендуется задавать интервал ревизий с помощью опции -v."
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr "Выводить от старых к новым."
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr "Показывать файлы, изменённые в каждой ревизии."
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr "Показать только указанную ревизию. См. также «help revisionspec»."
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr "Какие имена выводить, как авторов — first, all или committer."
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr "Авторы"
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr "Число уровней для вывода — 0 для всех, 1 для плоского вывода."
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr "Ограничить вывод лишь первыми N ревизиями."
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr "Показать изменения, сделанные в каждой ревизии, в виде патча."
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr "Показывать слияния, как это делает --levels 0."
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr "Не сообщать о закреплениях с более, чем одним родителем."
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+"Показать только ревизии, которые не являются частью обоих предков (требует -"
+"rX..Y)."
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr "Показывать ревизии, свойства которых удовлетворяют этому выражению."
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+"Показывать ревизии, комментарий которых удовлетворяет этому выражению."
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+"Показывать ревизии, закрепитель которых удовлетворяет этому выражению."
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr "Показывать ревизии, авторы которых удовлетворяют этому выражению."
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr "Показывать ревизии, ошибки которых удовлетворяют этому выражению."
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr "--exclude-common-ancestry требует -r с двумя ревизиями"
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr "Неизвестный путь в начале или конце интервала ревизий: %s"
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr "bzr %s не принимает две ревизии в различных ветвях."
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr "bzr %s --revision принимает одно или два значения."
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+"Вывести список файлов в дереве.\n"
+"    "
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr "Рекурсивно входить в поддиректории."
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr "Выводить пути относительно корня ветви."
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr "Выводить неизвестные файлы."
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr "Выводить файлы под контролем системы версий."
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr "Выводить игнорируемые файлы."
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr "Выводить файлы определённого типа: file, directory, symlink."
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr "указан неверный вид файла"
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr "Нельзя установить оба --verbose и --null"
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr "нельзя указать оба --from-root и PATH"
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr "Игнорировать указанные файлы или шаблоны."
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr "Смотрите подробности о синтаксисе шаблонов в «bzr help patterns»."
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+"Если файл .bzrignore не существует, команда ignore создаст его\n"
+"и добавит указанные файлы или шаблоны к только что созданному\n"
+"файлу. Команда ignore также автоматически добавит файл .bzrignore\n"
+"к системе версий. Создание файла .bzrignore без использования\n"
+"команды ignore потребует явного добавления командой add."
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+"Чтобы удалить шаблоны из списка игнорируемых файлов, отредактируйте\n"
+"файл .bzrignore. После добавления, редактирования или удаления этого\n"
+"файла, как неявно с помощью этой команды, так и явно при помощи\n"
+"редактора, не забывайте закреплять его."
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+"Bazaar также поддерживает глобальный игнорирования по пути "
+"~/.bazaar/ignore.\n"
+"На Windows глобальный файл игнорирования может быть найден в директории\n"
+"данных приложений. Ищите пути вроде\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Эта команда не изменяет глобальный файл игнорирования. Он может быть\n"
+"отредактирован вручную с помощью текстового редактора."
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+"Шаблоны, начинающиеся с '!', являются исключениями к шаблонам игнорирования\n"
+"и имеют приоритет над обычными шаблонами. Такие исключения используются для\n"
+"указания файлов, которые должны попасть под контроль системы версий, но\n"
+"по умолчанию игнорируются."
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+"Шаблоны, начинающиеся с '!!' ведут себя как обычные шаблоны, но имеют\n"
+"приоритет над шаблонами исключений '!'."
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+":Замечания: \n"
+"    \n"
+"* Шаблоны игнорирования, содержащие специальные символы оболочки,\n"
+"  должны быть заключены в кавычки при указании в командной строке."
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+"* Шаблоны игнорирования, начинающиеся с \"#\", являются комментариями.\n"
+"  Чтобы добавить шаблон, начинающийся с этого символа, используйте\n"
+"  префикс \"RE:\"."
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+":Примеры:\n"
+"    Игнорировать файл Makefile на верхнем уровне::"
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr "        bzr ignore ./Makefile"
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr "    Игнорировать файлы .class во всех директориях...::"
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr "        bzr ignore \"*.class\""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr "    ...но не игнорировать \"special.class\"::"
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr "        bzr ignore \"!special.class\""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr "    Игнорировать файлы, начинающиеся с символа \"#\"::"
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr "        bzr ignore \"RE:^#\""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr "    Игнорировать файлы .o в директории lib::"
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr "        bzr ignore \"lib/**/*.o\""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr "        bzr ignore \"RE:lib/.*\\.o\""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr "    Игнорировать всё, кроме верхней директории \"debian\"::"
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Игнорировать всё, кроме верхней директории \"local\",\n"
+"    но всегда игнорировать файлы, заканчивающиеся на ~, даже в local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr "Вывести правила игнорирования, которые bzr использует по умолчанию."
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+"Для ignore требуется как минимум одно из NAME_PATTERN или --default-rules."
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] "Найден некорректный шаблон игнорирования. %s"
+msgstr[1] "Найдены некорректные шаблоны игнорирования. %s"
+msgstr[2] "Найдены некорректные шаблоны игнорирования. %s"
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr "NAME_PATTERN не должен быть абсолютным путём"
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+"Предупреждение: следующие файлы под контролем системы версий и удовлетворяют "
+"шаблонам игнорирования:\n"
+"%s\n"
+"Эти файлы будут продолжать под контролем системы версий, пока вы не "
+"выполните 'bzr remove'.\n"
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr "Вывести игнорируемые файлы и шаблоны, которым они удовлетворяют."
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+"Вывести все игнорируемые файлы и шаблоны игнорирования, из-за которых эти\n"
+"файлы игнорируются."
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr "Альтернативно, чтобы вывести только файлы::"
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr "    bzr ls --ignored"
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr "некорректный номер ревизии: %r"
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+"Экспортировать текущую или прошлую ревизию в директорию назначения\r\n"
+"или архив."
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr "Если ревизия не указана, экспортирует последнюю ревизию."
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+"Формат может быть именем экспортируемого формата, как tar, tgz, tbz2.\n"
+"Если не указан, формат определяется по расширению. Если расширение\n"
+"отсутствует, экспортирует в директорию (эквивалентно --format=dir)."
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+"Если указан root, он будет использоваться как корневая директория\n"
+"внутри форматов-контейнеров (tar, zip, и т.д.). Если не указан, по\n"
+"умолчанию используется имя файла для эскпорта. Опция root не имеет\n"
+"эффекта для формата 'dir'."
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+"Если ветвь опущена, используется ветвь, содержащая текущую рабочую\n"
+"директорию."
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+"Замечание: Экспорт в zip деревьев с именами файлов, содержащими не-ASCII\r\n"
+"символы, не поддерживается."
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+"  ======================       =============================\n"
+"  Поддерживаемые форматы       Автоопределение по расширению\n"
+"  ======================       =============================\n"
+"      dir                                (нет)\n"
+"      tar                                .tar\n"
+"      tbz2                          .tar.bz2, .tbz2\n"
+"      tgz                            .tar.gz, .tgz\n"
+"      zip                                .zip\n"
+"  ======================       ============================="
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr "Тип файла для экспорта."
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr "Имя корневой директории внутри экспортируемого файла."
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+"Установить время изменения файлов на время последней ревизии, в которой они "
+"были изменены."
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr "--uncommitted требует рабочее дерево"
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr "Неподдерживаемый формат экспорта: %s"
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+"Вывести содержимое файла из определённой ревизии на стандартный вывод."
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr "Если ревизия не указана, используется последняя."
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+"Замечание: Не забывайте перенаправлять стандартный вывод при использовании\n"
+"этой команды на двоичном файле."
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr "Имя пути в старом дереве."
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr "Применить фильтры содержимого для отображения в удобной форме."
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr "bzr cat --revision принимает ровно один спецификатор ревизии"
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr "{0!r} не представлен в ревизии {1}"
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr "Закрепить изменения в новой ревизии."
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+"По умолчанию, закрепляется всё дерево и закрепляющий считается автором.\n"
+"Эти умолчания могут быть перезаписаны, как объяснено ниже."
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ":Выборочные закрепления:"
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+"  Если указаны файлы, закрепить только изменения в этих файлах.\n"
+"  Если указана директория, то закрепляется директория и всё её\n"
+"  содержимое."
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+"  Когда даны исключения, они имеют приоритет над выбранными файлами.\n"
+"  Например, чтобы закрепить изменения внутри foo, но не изменения\n"
+"  в foo/bar::"
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr "    bzr commit foo -x foo/bar"
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr "  Выборочные закрепления после слияния пока не поддерживаются."
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ":Выбор автора:"
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+"  Если автор изменения не тот же самый человек, что и закрепляющий,\n"
+"  вы можете указать имя автора, используя опцию --author. Имя должно\n"
+"  быть в том же формате, что и committer-id, например\n"
+"  \"John Doe <jdoe@example.com>\". Если в изменении участвовал более,\n"
+"  чем один автор, вы можете указать эту опцию несколько раз."
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ":Проверки:"
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+"  Распространённой ошибкой является забыть добавить новый файл перед\n"
+"  запуском команды commit. Опция --strict прерывает закрепление, если\n"
+"  присутствуют неизвестные файлы. Более продвинутые проверки могут\n"
+"  быть реализованы определением обработчиков. Подробности можно найти,\n"
+"  выполнив команду ``bzr help hooks''."
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ":На заметку:"
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+"  Если вы случайно закрепили неверные изменения или допустили орфо-\n"
+"  графическую ошибку в сообщении, вы можете использовать команду\n"
+"  uncommit, чтобы отменить последнее закрепление. Подробности смотрите\n"
+"  в «bzr help uncommit»."
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr "Не рассматривать изменения, сделанные в заданном пути."
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr "Описание новой ревизии."
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr "Закрепить, даже если ничего не изменилось."
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr "Взять сообщение о закреплении из этого файла."
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+"Отказываться закреплять, если в рабочем дереве есть неизвестные файлы."
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+"Вручную установить время закрепления, используя формат даты закрепления, "
+"напр. '2009-10-10 08:00:00 +0100'."
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+"Отметить ошибку, как исправленную в этой ревизии (см. «bzr help bugs»)."
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr "Установить имя автора, если оно отличается от имени закрепляющего."
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+"Совершить локальное закрепление в связанную ветвь. Локальные закрепления не "
+"выгружаются в основную ветвь до тех пор, пока не совершено нормальное "
+"закрепление."
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+"Если не указано сообщение, показывать изменения  формате diff вместе с "
+"обзором состояния в редакторе сообщения."
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+"При закреплении в иной системе контроля версий, не выгружать данные, которые "
+"нельзя в ней представить."
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+"Для ошибки %s не указан трекер. Используйте форму 'tracker:id' или укажите "
+"систему трекинга ошибок по умолчанию, используя опцию `bugtracker`.\n"
+"Больше информации об этом можно узнать, выполнив «bzr help bugs». "
+"Закрепление отклонено."
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+"Некорректная ошибка %s. Должна быть в формате 'tracker:id'.  Больше "
+"информации об этом можно узнать, выполнив «bzr help bugs».\n"
+"Закрепление отклонено."
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr "Ошибка %s не распознана. Закрепление отклонено."
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+"%s\n"
+"Закрепление отклонено."
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr "Не удалось разобрать --commit-time: "
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr "укажите либо --message, либо --file"
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr "укажите сообщение о закреплении, используя --message либо --file"
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+"Указано пустое сообщение о закреплении. Пожалуйста, укажите сообщение опцией "
+"--message либо --file или оставьте пустым, указав --message \"\"."
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+"Нет изменений для закрепления. Добавьте файлы, которые вы хотите закрепить, "
+"командой 'bzr add', или используйте --unchanged, чтобы принудительно сделать "
+"пустое закрепление."
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+"В рабочем дереве обнаружены конфликты. Выполните «bzr conflicts», чтобы "
+"вывести список конфликтов и «bzr resolve ФАЙЛ» для исправления."
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr "Закрепление отклонено, поскольку в рабочем дереве неизвестные файлы."
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+"Проверки рабочего дерева и ветви выведут что-либо только в случае\n"
+"обнаружения проблемы. Поля вывода проверки репозитория следующие:"
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+"ревизии\n"
+"    Это просто число проверенных ревизий.  Оно не указывает\n"
+"    на проблему."
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+"версифицированные файлы\n"
+"    Это просто число проверенных файлов под контролем системы\n"
+"    версий.  Оно не указывает на проблему."
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+"предки без ссылок\n"
+"    Тексты, являющиеся предками других текстов, но не имеющие\n"
+"    корректных ссылок в истории ревизии.  Это небольшая\n"
+"    проблема, с которой Bazaar может разобраться."
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+"уникальные тексты файлов\n"
+"    Это общее число уникального содержимого файлов, встреченного\n"
+"    в проверенных ревизиях.  Оно не указывает на проблему."
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+"повторяемые тексты файлов\n"
+"    Это общее число повторяемых текстов, встреченных\n"
+"    в проверенных ревизиях.  Тексты могут повторяться, если записи\n"
+"    файлов изменились, но их содержимое осталось прежним.  Оно не\n"
+"    указывает на проблему."
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr "    Проверить рабочее дерево и ветвь в 'foo'::"
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr "        bzr check --tree --branch foo"
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr "    Проверить только репозиторий в 'bar'::"
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr "        bzr check --repo bar"
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr "    Проверить всё в 'baz'::"
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr "        bzr check baz"
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr "Проверить ветвь, относящуюся к текущей директории."
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr "Проверить репозиторий, относящийся к текущей директории."
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr "Проверить рабочее дерево, относящееся к текущей директории."
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr "Обновить репозиторий, ветвь или рабочее дерево до нового формата."
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+"Обновить до определённого формата. Подробности см. в «bzr help formats»."
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr "Формат ветви"
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr "Удалить директорию backup.bzr при успешном завершении."
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+":Примеры:\n"
+"    Показать email текущего пользователя::"
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr "        bzr whoami --email"
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr "    Установить текущего пользователя::"
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr "        bzr whoami \"Frank Chu <fchu@example.com>\""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr "Показать только адрес email."
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr "Вывести или установить имя ветви."
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr "Установить, удалить или отобразить псевдонимы."
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+":Примеры:\n"
+"    Показать текущие псевдонимы::"
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr "        bzr alias"
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr "    Показать псевдоним для 'll'::"
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr "        bzr alias ll"
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr "    Установить псевдоним для 'll'::"
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr "        bzr alias ll=\"log --line -r-10..-1\""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr "    Удалить псевдоним для 'll'::"
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr "        bzr alias --remove ll"
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr "Удалить псевдоним."
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr "bzr alias --remove требуется псевдоним для удаления."
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+"subunit не доступен. Нужно установить subunit, чтобы использовать --subunit."
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+"--benchmark не поддерживается начиная с версии bzr 2.2; вместо этого "
+"используйте bzr-usertest"
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr "Вывести версию bzr."
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr "Вывести только номер версии."
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr "Да, он крут!\n"
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+"Преобразовать текущую ветвь в рабочую копию указанной ветви.\n"
+"Если ветвь не указаны, перепривязать последнее расположение привязки."
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+"После преобразования в рабочую копию, закрепления должны производиться\n"
+"над основной ветвью, прежде чем они могут быть применены к локальной."
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr "Преобразовать текущую рабочую копию в обычную ветвь."
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr "Удалить закрепления из локальной ветви только в рабочей копии."
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr "Ветвь, с которой связать рабочую копию."
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr "Выбрать ветвь рабочей копии и обновить."
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr "неизвестная команда «%s»"
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr "Нет справки для этой команды."
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ":Назначение: %s\n"
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+":Синтаксис:\n"
+"%s\n"
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ":Синтаксис:   %s\n"
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ":Опции:%s"
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+":Описание:\n"
+"  %s\n"
+"\n"
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+"Смотрите bzr help %s, чтобы получить подробности и примеры.\n"
+"\n"
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ":Псевдонимы:  "
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ":Из:     модуль «%s»\n"
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ":Смотрите также: %s"
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr "В именах опций разрешены только символы ASCII"
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr "команде {0!r} требуется один или больше {1}"
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr "команде {0!r} требуется аргумент {1}"
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr "лишний аргумент к команде {0}: {1}"
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr "Данные профиля записаны в «%s»."
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr "добавлены"
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr "изменены"
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr "Закрепление%s"
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr "Закреплена ревизия %d."
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr "удалён %s"
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr "отсутствует %s"
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr "переименованы"
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr "без изменений"
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr "Не удалось верифицировать подпись GPG с ошибкой «%(error)s»"
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr "Не удалось импортировать библиотеку «%(library)s»: %(error)s"
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr "python-gpgme не устонвлен, он нужен для верификации подписей"
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+"Рабочее дерево для %(basedir)s изменилось с последнего закрепления, но merge "
+"требует, чтобы оно не содержало изменений"
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr "Цикл в графе %(graph)r"
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr "Файл %(filename)s не содержит конфликтов."
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr "В файле «%(filename)s» нет пакета."
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr "Не удалось обработать версию пакета %(version)s: %(msg)s"
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+"В ветви %(base)s отсутствует ревизия %(text_revision)s файла %(file_id)s"
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+"Идентификатор файла {%(file_id)s} уже присутствует в инвентаре как %(entry)s"
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr "Перемещение в корневую директорию пока не поддерживается"
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr "Не удалось переименовать %(from_path)s в %(to_path)s: %(why)s"
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+"Не удалось переместить %(from_path)s%(operator)s "
+"%(to_path)s%(_has_extra)s%(extra)s"
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+"Не удалось переименовать %(from_path)s%(operator)s "
+"%(to_path)s%(_has_extra)s%(extra)s"
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr "Нечего совмещать."
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr "Diff3 не установлен на этой машине."
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] "{0} закрепление с неизвестным ключом"
+msgstr[1] "{0} закрепления с неизвестным ключом"
+msgstr[2] "{0} закреплений с неизвестным ключом"
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] "Неизвестным ключом {0} подписано {1} закрепление"
+msgstr[1] "Неизвестным ключом {0} подписаны {1} закрепления"
+msgstr[2] "Неизвестным ключом {0} подписаны {1} закреплений"
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr "Для подробностей запустите «bzr check»."
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr "Исправление информации последней ревизии {0} => {1}"
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr "Чтение данных инвентаря"
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr "Создание резервного инвентаря"
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr "Резервный инвентарь создан."
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr "Инвентарь восстановлен."
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr "Чтение индексов"
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr "Проверка неиспользуемых инвентарей"
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr "Резервный инвентарь создан"
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr "{0}теперь на стеке {1}\n"
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr "%s теперь не на стеке\n"
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr "bzr: ОШИБКА (игнорирована): %s"
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr "Копирование содержимого репозитория в тарбол..."
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr "Вычисление хешей"
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr "Определение столкновений хешей"
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr "{0} => {1}"
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr "Перемещение репозитория в repository.backup"
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr "Создание нового репозитория"
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr "Копирование содержимого"
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr "Удаление старого содержимого репозитория"
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr "репозиторий преобразован"
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr "Используется {0} {1}"
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr "Почтовый клиент «%s» не поддерживает определение тела"
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr "--remember требует указания ветви."
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr "Ветвь для отсылки неизвестна и не задана"
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+"Используется сохранённое {0} местоположение «{1}» для определения изменений, "
+"которые необходимо отправить."
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr "Нет такого формата отправки '%s'."
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr "bzr send принимает не более двух идентификаторов ревизии"
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr "Нет ревизий для отправки."
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+"- не поддерживается для директив merge, которые используют более, чем один "
+"файл вывода."
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr "Формат 0.9 не разрешает пакеты без патчей"
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr "Отложить добавление файла «%(path)s»?"
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr "Отложить двоичные изменения?"
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr "Отложить изменение «%s» из %(other)s в %(this)s?"
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr "Отложить удаление файла «%(path)s»?"
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr "Отложить %d изменений?"
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr "Отложить?"
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr "Отложить изменение цели «%(path)s» из «%(other)s» в «%(this)s»?"
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr "Отложить переименование «%(other)s» => «%(this)s»?"
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr "Изменения отложены с id «%d»."
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr "Выбранные изменения уничтожены."
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr "Выбранные изменения:"
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr "Удалить файл «%(path)s»?"
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr "Применить двоичные изменения?"
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr "Изменить «%(path)s» с %(this)s на %(other)s?"
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr "Добавить файл «%(path)s»?"
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr "Применить %d изменений?"
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr "Применить изменение?"
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr "Изменить цель «%(path)s» с «%(this)s» на «%(other)s»?"
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr "Переименовать «%(this)s» => «%(other)s»?"
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr "Нет отложенных изменений."
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr "Используются изменения с id «%d»."
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr "Сообщение: %s"
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr "Удалены изменения с id «%d»."
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr "Вызовы HPSS: {0} ({1} vfs) {2}"
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr "слушаю на порту: %s"
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+"Не удалось соединиться с текущей основной ветвью %(target)s: %(error)s Для "
+"принудительного переключения используйте --force."
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr "Дерево в актуальной ревизии %d."
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr "Обновлено до ревизии %d."
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr "Применить фазу"
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr "удаление файла"
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr "добавление файла"
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr "Построение дерева"
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr "Добавление содержимого файлй"
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr "*** {0} content-filter: {1} => {2!r}"
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr "Это рабочая копия. Ветвь (%s) необходимо обновлять отдельно."
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr "нельзя обновить из формата bzrdir %s"
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr "начинается обновление %s"
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr "завершено"
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr "Удаление backup.bzr"
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+"\n"
+"СВОДКА: произведено {0} обновлений, {1} успешно, {2} неуспешно"
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr "Найдено %d зависящих ветвей - обновление ..."
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr "Обновление bzrdirs"
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr "Обновление %s"
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr "Обновление {0} {1} ..."
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr "Удаление резервной копии ..."
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr "не удалось очистить {0}: {1}"
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr "Не удалось выполнить GetProcessMemoryInfo()"
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+"Невозможно производить отладку памяти на win32 без ctypes или win32process"
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr "WorkingSize {0:>7}КиБ\tPeakWorking {1:>7}КиБ\t{2}"
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr "WorkingSize       %8d КиБ"
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr "PeakWorking       %8d КиБ"
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr "PagefileUsage     %8d КиБ"
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr "PeakPagefileUsage %8d КиБ"
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr "PrivateUsage      %8d КиБ"
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr "PageFaultCount    %8d"
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr "Снова запустите обновление после исправления конфликтов."
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr "Информация по настройке аутентификации"
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+"Базовые команды:\n"
+"  bzr init           превратить директорию в ветвь системы версий\n"
+"  bzr branch         создать копию другой ветви"
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+"  bzr add            добавить файлы или директории к системе контроля "
+"версий\n"
+"  bzr ignore         игнорировать файл или шаблон\n"
+"  bzr mv             переместить или переименовать файл в системе контроля "
+"версий"
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+"  bzr status         вывести краткие изменения в рабочей копии\n"
+"  bzr diff           вывести подробные различия"
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+"  bzr merge          принять изменения из другой ветви\n"
+"  bzr commit         сохранить некоторые или все изменения\n"
+"  bzr send           переслать изменения по электронной почте"
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+"  bzr log            показать историю изменений\n"
+"  bzr check          проверить целостность"
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+"  bzr help init      подробные сведения например по команде init\n"
+"  bzr help commands  вывести список всех команд\n"
+"  bzr help topics    вывести список всех разделов справки\n"
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr "Базовые команды"
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr "Ветви"
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr "Связанные команды::"
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr "Информация о том, что такое ветвь"
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr "Установки трекера ошибок"
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr "Рабочие копии"
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr "Информация о том, что такое рабочая копия"
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr "Базовая справка по всем командам"
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr "Как исправлять отклонения ветвей"
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr "Переменные окружения"
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr "Имена и значения переменных окружения"
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr "Информация по обработке конца строки"
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr "Файлы"
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+":В Unix:   ~/.bazaar/bazaar.conf\n"
+":В Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr "Типичный файл конфигурации может выглядеть как::"
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr "Информация по файлам конфигурации и журналам"
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+"\n"
+".. замечание::"
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr "Общие настройки"
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr "Настройки, управляющие запуском Bazaar"
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr "Все скрытые команды"
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr "Интеграция с Launchpad.net"
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr "Больше информации можно найти на http://help.launchpad.net/\n"
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr "Использование Bazaar с Launchpad.net"
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr "Базовая информация об общих репозиториях."
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+"  N Файл создан\n"
+"  D Файл удалён\n"
+"  K Тип файла изменился\n"
+"  M Файл изменён"
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr "Вместо использования::"
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr "можно просто использовать::"
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr "  bzr branch ftp://host.com/path/to/my/branch"
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/sco.po b/po/sco.po
new file mode 100644
index 0000000..a351745
--- /dev/null
+++ b/po/sco.po
@@ -0,0 +1,13239 @@
+# Scots translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Scots <sco@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:21+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+"This report on versioned and unkent files, reporting them\n"
+"grouped by state.  Possible states are:"
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr "Remove the working tree frae a gien branch/checkoot."
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
new file mode 100644
index 0000000..17184e6
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,13237 @@
+# Swedish translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-04-23 13:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2012-04-24 05:22+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "hittade fel:%s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr "Du måste ange antingen --revision eller ett revision_id"
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr "Använd \"bzr checkout\" för att återskapa arbetsträdet."
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr "Inget arbetsträd att ta bort"
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr "Du kan inte ta bort arbetsträdet för en fjärrsökväg"
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr "Visa aktuellt revisionsnummer."
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr "--tree och --revision får inte användas samtidigt"
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr "Lägg till angivna filer eller kataloger."
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr "lade till %s\n"
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr "Flytta eller byt namn på en fil."
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr "    bzr mv KÄLLA... DESTINATION"
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr "Filer kan inte flyttas mellan grenar."
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr "--dry-run kräver --auto."
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr "kan inte flytta roten för grenen"
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr "--after får inte anges med --auto."
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr "  <protokoll>://[användare[:lösenord]@]värd[:port]/[sökväg]"
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr "  http://bzranvändare:FelLösen@bzr.exempel.se:8080/bzr/trunk"
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr "  bzr+ssh://remote@skal.exempel.se/~/mittprojekt/trunk"
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr "skulle referera till ``/home/remote/mittprojekt/trunk``."
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/tr.po b/po/tr.po
new file mode 100644
index 0000000..f719c24
--- /dev/null
+++ b/po/tr.po
@@ -0,0 +1,13237 @@
+# Turkish translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-01-16 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2012-02-04 06:21+0000\n"
+"X-Generator: Launchpad (build 14738)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/ug.po b/po/ug.po
new file mode 100644
index 0000000..eba7d46
--- /dev/null
+++ b/po/ug.po
@@ -0,0 +1,13237 @@
+# Uyghur translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-02-17 08:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uyghur <ug@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2012-02-18 05:46+0000\n"
+"X-Generator: Launchpad (build 14814)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr "تېپىلغان خاتالىقلار: %s"
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""
diff --git a/po/vi.po b/po/vi.po
new file mode 100644
index 0000000..383e15f
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,13237 @@
+# Vietnamese translation for bzr
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the bzr package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-02 17:39+0100\n"
+"PO-Revision-Date: 2012-03-10 02:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2012-03-11 05:03+0000\n"
+"X-Generator: Launchpad (build 14914)\n"
+
+#: bzrlib/add.py:95
+msgid "skipping {0} (larger than {1} of {2} bytes)"
+msgstr ""
+
+#: bzrlib/branch.py:872
+msgid "Unstacking"
+msgstr ""
+
+#: bzrlib/branch.py:3205
+#, python-format
+msgid "Pushed up to revision %d."
+msgstr ""
+
+#: bzrlib/branch.py:3207
+#, python-format
+msgid "%d tag updated."
+msgid_plural "%d tags updated."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/branch.py:3210
+msgid "No new revisions or tags to push."
+msgstr ""
+
+#: bzrlib/branch.py:3212
+msgid "No new revisions to push."
+msgstr ""
+
+#: bzrlib/branch.py:3232
+msgid "checked branch {0} format {1}"
+msgstr ""
+
+#: bzrlib/branch.py:3235
+#, python-format
+msgid "found error:%s"
+msgstr ""
+
+#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
+#, python-format
+msgid "Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/builtins.py:218
+#, python-format
+msgid "bzr %s --revision takes exactly one revision identifier"
+msgstr ""
+
+#: bzrlib/builtins.py:303
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:305
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:308
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:311
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:315
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:320
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:323
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:326
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:329
+msgid ""
+"Additionally for directories, symlinks and files with a changed\n"
+"executable bit, Bazaar indicates their type using a trailing\n"
+"character: '/', '@' or '*' respectively. These decorations can be\n"
+"disabled using the '--no-classify' option."
+msgstr ""
+
+#: bzrlib/builtins.py:334
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:337
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:341
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:346
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:351
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:354
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+#: bzrlib/builtins.py:363
+msgid "Use short status indicators."
+msgstr ""
+
+#: bzrlib/builtins.py:365
+msgid "Only show versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:367
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:370
+msgid "Do not mark object type using indicator."
+msgstr ""
+
+#: bzrlib/builtins.py:385
+msgid "bzr status --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
+msgid "You can only supply one of revision_id or --revision"
+msgstr ""
+
+#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
+msgid "You must supply either --revision or a revision_id"
+msgstr ""
+
+#: bzrlib/builtins.py:439
+#, python-format
+msgid "Repository %r does not support access to raw revision texts"
+msgstr ""
+
+#: bzrlib/builtins.py:450
+msgid "The repository {0} contains no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:457
+msgid "You cannot specify a NULL revision."
+msgstr ""
+
+#: bzrlib/builtins.py:549
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:551
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:554
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+#: bzrlib/builtins.py:560
+msgid ""
+"Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:574
+msgid "No working tree to remove"
+msgstr ""
+
+#: bzrlib/builtins.py:576
+msgid "You cannot remove the working tree of a remote path"
+msgstr ""
+
+#: bzrlib/builtins.py:585
+msgid "You cannot remove the working tree from a lightweight checkout"
+msgstr ""
+
+#: bzrlib/builtins.py:625
+msgid ""
+"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
+"instead. Use \"--force\" if you are sure you want to reset the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:636
+msgid ""
+", the header appears corrupt, try passing -r -1 to set the state to the last "
+"commit"
+msgstr ""
+
+#: bzrlib/builtins.py:640
+msgid "failed to reset the tree state{0}"
+msgstr ""
+
+#: bzrlib/builtins.py:644
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:646
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:659
+msgid "--tree and --revision can not be used together"
+msgstr ""
+
+#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:700
+msgid "Show revno of working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:748
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:750
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:754
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:762
+msgid ""
+"A warning will be printed when nested trees are encountered,\n"
+"unless they are explicitly ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:765
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:768
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:773
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:776
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:784
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+#: bzrlib/builtins.py:787
+msgid ""
+"In recursive mode, files larger than the configuration option \n"
+"add.maximum_file_size will be skipped. Named items are never skipped due\n"
+"to file size."
+msgstr ""
+
+#: bzrlib/builtins.py:794
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+#: bzrlib/builtins.py:800
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:836
+msgid "ignored {0} matching \"{1}\"\n"
+msgstr ""
+
+#: bzrlib/builtins.py:841
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:843
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:850
+msgid "No error if existing, make parent directories as needed."
+msgstr ""
+
+#: bzrlib/builtins.py:884
+#, python-format
+msgid "added %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:926
+#, python-format
+msgid "invalid kind %r specified"
+msgstr ""
+
+#: bzrlib/builtins.py:963
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:967
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:971
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:977
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+#: bzrlib/builtins.py:984
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+#: bzrlib/builtins.py:986
+msgid "Automatically guess renames."
+msgstr ""
+
+#: bzrlib/builtins.py:987
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:996
+msgid "--dry-run requires --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1000
+msgid "missing file argument"
+msgstr ""
+
+#: bzrlib/builtins.py:1004
+msgid "can not move root of branch"
+msgstr ""
+
+#: bzrlib/builtins.py:1010
+msgid "Only one path may be specified to --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1013
+msgid "--after cannot be specified with --auto."
+msgstr ""
+
+#: bzrlib/builtins.py:1050
+msgid "to mv multiple files the destination must be a versioned directory"
+msgstr ""
+
+#: bzrlib/builtins.py:1102
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1104
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:1109
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:1113
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:1117
+msgid ""
+"If there is no default location set, the first pull will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1122
+msgid ""
+"The --verbose option will display the revisions pulled using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1126
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+#: bzrlib/builtins.py:1134
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1136
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1139
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1168
+msgid "Need working tree for --show-base."
+msgstr ""
+
+#: bzrlib/builtins.py:1184
+msgid "No pull location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1190
+#, python-format
+msgid "Using saved parent location: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
+msgid "Cannot use -r with merge directives or bundles"
+msgstr ""
+
+#: bzrlib/builtins.py:1238
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1240
+msgid ""
+"The target branch will not have its working tree populated because this\n"
+"is both expensive, and is not supported on remote file systems."
+msgstr ""
+
+#: bzrlib/builtins.py:1243
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1246
+msgid ""
+"This command only works on branches that have not diverged.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one\n"
+"that has not been merged (directly or indirectly) by the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1250
+msgid ""
+"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
+"the other branch completely, discarding its unmerged changes."
+msgstr ""
+
+#: bzrlib/builtins.py:1253
+msgid ""
+"If you want to ensure you have the different changes in the other branch,\n"
+"do a merge (see bzr help merge) from the other branch, and commit that.\n"
+"After that you will be able to do a push without '--overwrite'."
+msgstr ""
+
+#: bzrlib/builtins.py:1257
+msgid ""
+"If there is no default push location set, the first push will set it (use\n"
+"--no-remember to avoid setting it).  After that, you can omit the\n"
+"location to use the default.  To change the default, use --remember. The\n"
+"value will only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:1262
+msgid ""
+"The --verbose option will display the revisions pushed using the log_format\n"
+"configuration option. You can use a different format by overriding it with\n"
+"-Olog_format=<other_format>."
+msgstr ""
+
+#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
+msgid ""
+"Branch to push from, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1276
+msgid ""
+"By default push will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow push to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1281
+msgid ""
+"Create a stacked branch that references the public location of the parent "
+"branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1284
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
+msgid ""
+"Refuse to push if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:1292
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1336
+msgid "Could not determine branch to refer to."
+msgstr ""
+
+#: bzrlib/builtins.py:1345
+#, python-format
+msgid ""
+"No push location known or specified. To push to the parent branch (at %s), "
+"use 'bzr push :parent'."
+msgstr ""
+
+#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
+msgid "No push location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:1355
+#, python-format
+msgid "Using saved push location: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1365
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1367
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1374
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"branch foo/bar -r 5\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1377
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+#: bzrlib/builtins.py:1387
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1389
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1392
+msgid ""
+"Create a stacked branch referring to the source branch. The new branch will "
+"depend on the availability of the source branch for all operations."
+msgstr ""
+
+#: bzrlib/builtins.py:1396
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+#: bzrlib/builtins.py:1398
+msgid ""
+"By default branch will fail if the target directory exists, but does not "
+"already have a control directory.  This flag will allow branch to proceed."
+msgstr ""
+
+#: bzrlib/builtins.py:1403
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1450
+#, python-format
+msgid "Target directory \"%s\" already exists."
+msgstr ""
+
+#: bzrlib/builtins.py:1462
+#, python-format
+msgid "Parent of \"%s\" does not exist."
+msgstr ""
+
+#: bzrlib/builtins.py:1481
+msgid "The branch {0} has no revision {1}."
+msgstr ""
+
+#: bzrlib/builtins.py:1496 bzrlib/push.py:53
+#, python-format
+msgid "Created new stacked branch referring to %s."
+msgstr ""
+
+#: bzrlib/builtins.py:1500
+#, python-format
+msgid "Branched %d revision."
+msgid_plural "Branched %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:1505
+#, python-format
+msgid "New branch bound to %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
+#, python-format
+msgid "Switched to branch: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:1515
+msgid "List the branches available at the current location."
+msgstr ""
+
+#: bzrlib/builtins.py:1517
+msgid ""
+"This command will print the names of all the branches at the current\n"
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid ""
+"Recursively scan for branches rather than just looking in the specified "
+"location."
+msgstr ""
+
+#: bzrlib/builtins.py:1554
+msgid "(default)"
+msgstr ""
+
+#: bzrlib/builtins.py:1566
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1573
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create "
+"./bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1580
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1590
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+#: bzrlib/builtins.py:1597
+msgid "Get file contents from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1599
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1640
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1670
+msgid "Update a working tree to a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid ""
+"This will perform a merge of the destination revision (the tip of the\n"
+"branch, or the specified revision) into the working tree, and then make\n"
+"that revision the basis revision for the working tree.  "
+msgstr ""
+
+#: bzrlib/builtins.py:1676
+msgid ""
+"You can use this to visit an older revision, or to update a working tree\n"
+"that is out of date from its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If there are any uncommitted changes in the tree, they will be carried\n"
+"across and remain as uncommitted changes after the update.  To discard\n"
+"these changes, use 'bzr revert'.  The uncommitted changes may conflict\n"
+"with the changes brought in by the change in basis revision."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+msgid ""
+"If the tree's branch is bound to a master branch, bzr will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1687
+msgid ""
+"You cannot update just a single file or directory, because each Bazaar\n"
+"working tree has just a single basis revision.  If you want to restore a\n"
+"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
+"update'.  If you want to restore a file to its state in a previous\n"
+"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
+"out the old content of that file to a new location."
+msgstr ""
+
+#: bzrlib/builtins.py:1694
+msgid ""
+"The 'dir' argument, if given, must be the location of the root of a\n"
+"working tree to update.  By default, the working tree that contains the \n"
+"current working directory is used."
+msgstr ""
+
+#: bzrlib/builtins.py:1710
+msgid "bzr update --revision takes exactly one revision"
+msgstr ""
+
+#: bzrlib/builtins.py:1718
+msgid "bzr update can only update a whole tree, not a file or subdirectory"
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid "Tree is up to date at revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1765
+#, python-format
+msgid ""
+"branch has no revision %s\n"
+"bzr update --revision only works for a revision in the branch history"
+msgstr ""
+
+#: bzrlib/builtins.py:1771
+msgid "Updated to revision {0} of branch {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:1775
+msgid ""
+"Your local commits will now show as pending merges with 'bzr status', and "
+"can be committed with 'bzr commit'."
+msgstr ""
+
+#: bzrlib/builtins.py:1784
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1786
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1789
+msgid ""
+"In verbose mode, statistical information is included with each report.\n"
+"To see extended statistic information, use a verbosity level of 2 or\n"
+"higher by specifying the verbose option multiple times, e.g. -vv."
+msgstr ""
+
+#: bzrlib/builtins.py:1793
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
+#: bzrlib/builtins.py:6442
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:1797
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1799
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1801
+msgid ""
+"  Display the above together with extended format information and\n"
+"  basic statistics (like the number of files in the working tree and\n"
+"  number of revisions in the branch and repository):"
+msgstr ""
+
+#: bzrlib/builtins.py:1805
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1807
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1809
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1828
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1830
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+#: bzrlib/builtins.py:1838
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+#: bzrlib/builtins.py:1840
+msgid "The file deletion mode to be used."
+msgstr ""
+
+#: bzrlib/builtins.py:1841
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1842
+msgid "Backup changed files (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:1843
+msgid "Delete from bzr but leave the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:1844
+msgid "Don't backup changed files."
+msgstr ""
+
+#: bzrlib/builtins.py:1845
+msgid ""
+"Delete all the specified files, even if they can not be recovered and even "
+"if they are non-empty directories. (deprecated, use no-backup)"
+msgstr ""
+
+#: bzrlib/builtins.py:1854
+msgid "(The --force option is deprecated, rather use --no-backup in future.)"
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid "No matching files."
+msgstr ""
+
+#: bzrlib/builtins.py:1932
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1934
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1939
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1944
+msgid ""
+"At the same time it is run it may recompress data resulting in\n"
+"a potential saving in disk space or performance gain."
+msgstr ""
+
+#: bzrlib/builtins.py:1947
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Format for the bzr 2.0 series.\n"
+"Uses group-compress storage.\n"
+"Provides rich roots which are a one-way transition.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid ""
+"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
+"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
+msgstr ""
+
+#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
+msgid "The 2a format with experimental support for colocated branches.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2015
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2017
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:2020
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2025
+msgid ""
+"If there is already a branch at the location but it has no working tree,\n"
+"the tree can be populated with 'bzr checkout'."
+msgstr ""
+
+#: bzrlib/builtins.py:2028
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2030
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+#: bzrlib/builtins.py:2041
+msgid ""
+"Create the path leading up to the branch if it does not already exist."
+msgstr ""
+
+#: bzrlib/builtins.py:2044
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2052
+msgid ""
+"Never change revnos or the existing log.  Append revisions to it only."
+msgstr ""
+
+#: bzrlib/builtins.py:2055
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2075 bzrlib/push.py:110
+#, python-format
+msgid ""
+"Parent directory of %s does not exist.\n"
+"You may supply --create-prefix to create all leading parent directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2109
+msgid ""
+"This branch format cannot be set to append-revisions-only.  Try --default."
+msgstr ""
+
+#: bzrlib/builtins.py:2120
+msgid "Created a {0} (format: {1})\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2129
+#, python-format
+msgid "Using shared repository: %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:2133
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:2135
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2140
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:2147
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:2150
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:2153
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:2155
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+#: bzrlib/builtins.py:2163
+msgid ""
+"Specify a format for this repository. See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:2167
+msgid "Repository format"
+msgstr ""
+
+#: bzrlib/builtins.py:2169
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:2195
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2197
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:2204
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2207
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:2220
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:2223
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:2225
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2227
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:2229
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:2231
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:2233
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:2235
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2237
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:2239
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:2241
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+msgid ""
+"    Note that in the case of a merge, the -c option shows the changes\n"
+"    compared to the left hand parent. To see the changes against\n"
+"    another parent, use::"
+msgstr ""
+
+#: bzrlib/builtins.py:2249
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:2251
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:2254
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:2256
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2258
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2260
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2262
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2264
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:2266
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:2268
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2274
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+#: bzrlib/builtins.py:2284
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+#: bzrlib/builtins.py:2287
+msgid ""
+"Set prefixes added to old and new filenames, as two values separated by a "
+"colon. (eg \"old/:new/\")."
+msgstr ""
+
+#: bzrlib/builtins.py:2290
+msgid "Branch/tree to compare from."
+msgstr ""
+
+#: bzrlib/builtins.py:2294
+msgid "Branch/tree to compare to."
+msgstr ""
+
+#: bzrlib/builtins.py:2300
+msgid "Use this command to compare files."
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid "Diff format to use."
+msgstr ""
+
+#: bzrlib/builtins.py:2307
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2329
+msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
+msgstr ""
+
+#: bzrlib/builtins.py:2333
+msgid "bzr diff --revision takes exactly one or two revision specifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
+#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
+msgid "{0} and {1} are mutually exclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2358
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2436
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2438
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2453
+msgid "The limit argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2461
+msgid "The levels argument must be an integer."
+msgstr ""
+
+#: bzrlib/builtins.py:2466
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2468
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2473
+msgid ""
+"  bzr log                       log the current branch\n"
+"  bzr log foo.py                log a file in its branch\n"
+"  bzr log http://server/branch  log a branch on a server"
+msgstr ""
+
+#: bzrlib/builtins.py:2477
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2484
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2486
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2491
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2494
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2500
+msgid ""
+"  Note that the default number of levels to display is a function of the\n"
+"  log format. If the -n option is not used, the standard log formats show\n"
+"  just the top level (mainline)."
+msgstr ""
+
+#: bzrlib/builtins.py:2504
+msgid ""
+"  Status summaries are shown using status flags like A, M, etc. To see\n"
+"  the changes explained using words like ``added`` and ``modified``\n"
+"  instead, use the -vv option."
+msgstr ""
+
+#: bzrlib/builtins.py:2508
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2510
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2515
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2517
+msgid ""
+"  The -r option can be used to specify what revision or range of revisions\n"
+"  to filter against. The various forms are shown below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2520
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2525
+msgid ""
+"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
+"  Some common examples are given below::"
+msgstr ""
+
+#: bzrlib/builtins.py:2528
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2535
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2542
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2544
+msgid ""
+"  If parameters are given and the first one is not a branch, the log\n"
+"  will be filtered to show only those revisions that changed the\n"
+"  nominated files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:2548
+msgid ""
+"  Filenames are interpreted within their historical context. To log a\n"
+"  deleted file, specify a revision range so that the file existed at\n"
+"  the end or start of the range."
+msgstr ""
+
+#: bzrlib/builtins.py:2552
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2555
+msgid ""
+"  * revision 1: add tutorial.txt\n"
+"  * revision 2: modify tutorial.txt\n"
+"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
+msgstr ""
+
+#: bzrlib/builtins.py:2559
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2561
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2563
+msgid ""
+"  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2565
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2568
+msgid ""
+"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
+"    was no file called guide.txt in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2571
+msgid ""
+"  Renames are always followed by log. By design, there is no need to\n"
+"  explicitly ask for this (and no way to stop logging a file back\n"
+"  until it was last renamed)."
+msgstr ""
+
+#: bzrlib/builtins.py:2575
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2577
+msgid ""
+"  The --match option can be used for finding revisions that match a\n"
+"  regular expression in a commit message, committer, author or bug.\n"
+"  Specifying the option several times will match any of the supplied\n"
+"  expressions. --match-author, --match-bugs, --match-committer and\n"
+"  --match-message can be used to only match a specific field."
+msgstr ""
+
+#: bzrlib/builtins.py:2583
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2585
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2591
+msgid ""
+"  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2593
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2598
+msgid ""
+"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
+"  will show the last 10 mainline revisions. To see the details of a\n"
+"  particular revision X,  ``bzr show -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2605
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2610
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2615
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+#: bzrlib/builtins.py:2624
+msgid "Show from oldest to newest."
+msgstr ""
+
+#: bzrlib/builtins.py:2627
+msgid "Show files changed in each revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2633
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+#: bzrlib/builtins.py:2637
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+#: bzrlib/builtins.py:2638
+msgid "Authors"
+msgstr ""
+
+#: bzrlib/builtins.py:2643
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+#: bzrlib/builtins.py:2653
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:2658
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+#: bzrlib/builtins.py:2660
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+#: bzrlib/builtins.py:2664
+msgid "Do not report commits with more than one parent."
+msgstr ""
+
+#: bzrlib/builtins.py:2666
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)."
+msgstr ""
+
+#: bzrlib/builtins.py:2670
+msgid "Show digital signature validity."
+msgstr ""
+
+#: bzrlib/builtins.py:2673
+msgid "Show revisions whose properties match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2677
+msgid "Show revisions whose message matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2681
+msgid "Show revisions whose committer matches this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2685
+msgid "Show revisions whose authors match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2689
+msgid "Show revisions whose bugs match this expression."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid "--exclude-common-ancestry requires -r with two revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:2771
+#, python-format
+msgid "Path unknown at end or start of revision range: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:2888
+#, python-format
+msgid "bzr %s doesn't accept two revisions in different branches."
+msgstr ""
+
+#: bzrlib/builtins.py:2904
+#, python-format
+msgid "bzr %s --revision takes one or two values."
+msgstr ""
+
+#: bzrlib/builtins.py:2949
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2958
+msgid "Recurse into subdirectories."
+msgstr ""
+
+#: bzrlib/builtins.py:2960
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2962
+msgid "Print unknown files."
+msgstr ""
+
+#: bzrlib/builtins.py:2963
+msgid "Print versioned files."
+msgstr ""
+
+#: bzrlib/builtins.py:2966
+msgid "Print ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:2968
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2981
+msgid "invalid kind specified"
+msgstr ""
+
+#: bzrlib/builtins.py:2984
+msgid "Cannot set both --verbose and --null"
+msgstr ""
+
+#: bzrlib/builtins.py:2993
+msgid "cannot specify both --from-root and PATH"
+msgstr ""
+
+#: bzrlib/builtins.py:3080
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3082
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3084
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:3095
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
+"precedence over regular ignores.  Such exceptions are used to specify\n"
+"files that should be versioned which would otherwise be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3105
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:3108
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:3113
+msgid ""
+"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
+"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
+msgstr ""
+
+#: bzrlib/builtins.py:3116
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:3119
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:3121
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:3123
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3125
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:3127
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:3129
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:3131
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3135
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3139
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:3141
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:3143
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+#: bzrlib/builtins.py:3157
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:3169
+msgid "ignore requires at least one NAME_PATTERN or --default-rules."
+msgstr ""
+
+#: bzrlib/builtins.py:3180
+#, python-format
+msgid "Invalid ignore pattern found. %s"
+msgid_plural "Invalid ignore patterns found. %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:3189
+msgid "NAME_PATTERN should not be an absolute path"
+msgstr ""
+
+#: bzrlib/builtins.py:3202
+#, python-format
+msgid ""
+"Warning: the following files are version controlled and match your ignore "
+"pattern:\n"
+"%s\n"
+"These files will continue to be version controlled unless you 'bzr remove' "
+"them.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:3209
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:3211
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:3214
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:3216
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:3250
+#, python-format
+msgid "not a valid revision-number: %r"
+msgstr ""
+
+#: bzrlib/builtins.py:3257
+msgid ""
+"Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:3259
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3261
+msgid ""
+"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
+"given, try to find the format with the extension. If no extension\n"
+"is found exports to a directory (equivalent to --format=dir)."
+msgstr ""
+
+#: bzrlib/builtins.py:3265
+msgid ""
+"If root is supplied, it will be used as the root directory inside\n"
+"container formats (tar, zip, etc). If it is not supplied it will default\n"
+"to the exported filename. The root option has no effect for 'dir' format."
+msgstr ""
+
+#: bzrlib/builtins.py:3269
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:3272
+msgid ""
+"Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3274
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+#: bzrlib/builtins.py:3288
+msgid "Type of file to export to."
+msgstr ""
+
+#: bzrlib/builtins.py:3291
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+#: bzrlib/builtins.py:3295
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+#: bzrlib/builtins.py:3297
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3300
+msgid ""
+"Export the working tree contents rather than that of the last revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3319
+msgid "--uncommitted requires a working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:3328
+#, python-format
+msgid "Unsupported export format: %s"
+msgstr ""
+
+#: bzrlib/builtins.py:3332
+msgid ""
+"Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:3334
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:3336
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid "The path name in the old tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3343
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "bzr cat --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
+msgid "{0!r} is not present in revision {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:3414
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3416
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3423
+msgid ""
+"By default, the entire tree is committed and the person doing the\n"
+"commit is assumed to be the author. These defaults can be overridden\n"
+"as explained below."
+msgstr ""
+
+#: bzrlib/builtins.py:3427
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3429
+msgid ""
+"  If selected files are specified, only changes to those files are\n"
+"  committed.  If a directory is specified then the directory and\n"
+"  everything within it is committed."
+msgstr ""
+
+#: bzrlib/builtins.py:3433
+msgid ""
+"  When excludes are given, they take precedence over selected files.\n"
+"  For example, to commit only changes within foo, but not changes\n"
+"  within foo/bar::"
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3441
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3443
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3450
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3452
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3458
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3460
+msgid ""
+"  If you accidentially commit the wrong changes or make a spelling\n"
+"  mistake in the commit message say, you can use the uncommit command\n"
+"  to undo it. See ``bzr help uncommit`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3464
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3474
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+#: bzrlib/builtins.py:3477
+msgid "Description of the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3480
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+#: bzrlib/builtins.py:3484
+msgid "Take commit message from this file."
+msgstr ""
+
+#: bzrlib/builtins.py:3486
+msgid "Refuse to commit if there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3489
+msgid ""
+"Manually set a commit time using commit date format, e.g. '2009-10-10 "
+"08:00:00 +0100'."
+msgstr ""
+
+#: bzrlib/builtins.py:3492
+msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
+msgstr ""
+
+#: bzrlib/builtins.py:3495
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid ""
+"Perform a local commit in a bound branch.  Local commits are not pushed to "
+"the master branch until a normal commit is performed."
+msgstr ""
+
+#: bzrlib/builtins.py:3504
+msgid ""
+"When no message is supplied, show the diff along with the status summary in "
+"the message editor."
+msgstr ""
+
+#: bzrlib/builtins.py:3507
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+#, python-format
+msgid ""
+"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
+"default bug tracker using the `bugtracker` option.\n"
+"See \"bzr help bugs\" for more information on this feature. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+#, python-format
+msgid ""
+"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
+"for more information on this feature.\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3543
+#, python-format
+msgid "Unrecognized bug %s. Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3546
+#, python-format
+msgid ""
+"%s\n"
+"Commit refused."
+msgstr ""
+
+#: bzrlib/builtins.py:3570
+msgid "Could not parse --commit-time: "
+msgstr ""
+
+#: bzrlib/builtins.py:3610
+msgid "please specify either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3639
+msgid "please specify a commit message with either --message or --file"
+msgstr ""
+
+#: bzrlib/builtins.py:3642
+msgid ""
+"Empty commit message specified. Please specify a commit message with either -"
+"-message or --file or leave a blank message with --message \"\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3662
+msgid ""
+"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
+"-unchanged to force an empty commit."
+msgstr ""
+
+#: bzrlib/builtins.py:3666
+msgid ""
+"Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
+"resolve FILE\" to resolve."
+msgstr ""
+
+#: bzrlib/builtins.py:3670
+msgid "Commit refused because there are unknown files in the working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:3673
+msgid ""
+"\n"
+"To commit to master branch, run update and then commit.\n"
+"You can also pass --local to commit to continue working disconnected."
+msgstr ""
+
+#: bzrlib/builtins.py:3681
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3683
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3686
+msgid ""
+"The working tree and branch checks will only give output if a problem is\n"
+"detected. The output fields of the repository check are:"
+msgstr ""
+
+#: bzrlib/builtins.py:3689
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3693
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3697
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3702
+msgid ""
+"unique file texts\n"
+"    This is the total number of unique file contents\n"
+"    seen in the checked revisions.  It does not indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3706
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3712
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3717
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3719
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3721
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3723
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3725
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3727
+msgid "        bzr check baz"
+msgstr ""
+
+#: bzrlib/builtins.py:3733
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3735
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3737
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3751
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3753
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3759
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3766
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3774
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3779
+msgid ""
+"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
+msgstr ""
+
+#: bzrlib/builtins.py:3787
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3791
+msgid "Branch format"
+msgstr ""
+
+#: bzrlib/builtins.py:3793
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3795
+msgid "Show what would be done, but don't actually do anything."
+msgstr ""
+
+#: bzrlib/builtins.py:3810
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3812
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3815
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3817
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3819
+msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
+msgstr ""
+
+#: bzrlib/builtins.py:3823
+msgid "Display email address only."
+msgstr ""
+
+#: bzrlib/builtins.py:3825
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "--email can only be used to display existing identity"
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3875
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3878
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3898
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3903
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3905
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3907
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3909
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3911
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3913
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3915
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3920
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3938
+msgid "bzr alias --remove expects an alias to remove."
+msgstr ""
+
+#: bzrlib/builtins.py:4119
+msgid ""
+"subunit not available. subunit needs to be installed to use --subunit."
+msgstr ""
+
+#: bzrlib/builtins.py:4136
+msgid ""
+"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
+msgstr ""
+
+#: bzrlib/builtins.py:4183
+msgid "Show version of bzr."
+msgstr ""
+
+#: bzrlib/builtins.py:4187
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:4206
+msgid "It sure does!\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4230
+#, python-format
+msgid "merge base is revision %s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4234
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4236
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember.  The source of the\n"
+"merge may also be specified in the form of a path to a file in another\n"
+"branch:  in this case, only the modifications to that file are merged into\n"
+"the current working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:4244
+msgid ""
+"When merging from a branch, by default bzr will try to merge in all new\n"
+"work from the other branch, automatically determining an appropriate base\n"
+"revision.  If this fails, you may need to give an explicit base."
+msgstr ""
+
+#: bzrlib/builtins.py:4248
+msgid ""
+"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
+"try to merge in all new work up to and including revision OTHER."
+msgstr ""
+
+#: bzrlib/builtins.py:4251
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"cherrypicks. The changes look like a normal commit, and the history of the\n"
+"changes from the other branch is not stored in the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4259
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you can commit."
+msgstr ""
+
+#: bzrlib/builtins.py:4266
+msgid ""
+"Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4268
+msgid ""
+"If there is no default branch set, the first merge will set it (use\n"
+"--no-remember to avoid setting it). After that, you can omit the branch\n"
+"to use the default.  To change the default, use --remember. The value will\n"
+"only be saved if the remote location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:4273
+msgid ""
+"The results of the merge are placed into the destination working\n"
+"directory, where they can be reviewed (with bzr diff), tested, and then\n"
+"committed to record the result of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4277
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given.  If --force is given, then the changes from the source \n"
+"will be merged with the current working tree, including any uncommitted\n"
+"changes in the tree.  The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:4283
+msgid ""
+"If one would like to merge changes from the working tree of the other\n"
+"branch without merging any committed revisions, the --uncommitted option\n"
+"can be given."
+msgstr ""
+
+#: bzrlib/builtins.py:4287
+msgid ""
+"To select only some changes to merge, use \"merge -i\", which will prompt\n"
+"you to apply each diff hunk and file change, similar to \"shelve\"."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4293
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4295
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:4297
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4299
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:4301
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:4303
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:4305
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:4307
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:4310
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+#: bzrlib/builtins.py:4322
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4328
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+#: bzrlib/builtins.py:4330
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+#: bzrlib/builtins.py:4335
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:4337
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4339
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4361
+msgid ""
+"Merging into empty branches not currently supported, "
+"https://bugs.launchpad.net/bzr/+bug/308562"
+msgstr ""
+
+#: bzrlib/builtins.py:4388
+msgid "Cannot use --uncommitted with bundles or merge directives."
+msgstr ""
+
+#: bzrlib/builtins.py:4399
+msgid "Cannot use --uncommitted and --revision at the same time."
+msgstr ""
+
+#: bzrlib/builtins.py:4419
+msgid "merger: "
+msgstr ""
+
+#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
+msgid "Nothing to do."
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "Cannot pull individual files"
+msgstr ""
+
+#: bzrlib/builtins.py:4433
+msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
+msgstr ""
+
+#: bzrlib/builtins.py:4491
+#, python-format
+msgid "Show-base is not supported for this merge type. %s"
+msgstr ""
+
+#: bzrlib/builtins.py:4500
+#, python-format
+msgid "Conflict reduction is not supported for merge type %s."
+msgstr ""
+
+#: bzrlib/builtins.py:4504
+msgid "Cannot do conflict reduction and show base."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid "No location specified or remembered"
+msgstr ""
+
+#: bzrlib/builtins.py:4617
+msgid "{0} remembered {1} location {2}"
+msgstr ""
+
+#: bzrlib/builtins.py:4623
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4625
+msgid ""
+"Use this if you want to try a different merge technique while resolving\n"
+"conflicts.  Some merge techniques are better than others, and remerge\n"
+"lets you try different ones on different files."
+msgstr ""
+
+#: bzrlib/builtins.py:4629
+msgid ""
+"The options for remerge have the same meaning and defaults as the ones for\n"
+"merge.  The difference is that remerge can (only) be run when there is a\n"
+"pending merge, and it lets you specify particular files."
+msgstr ""
+
+#: bzrlib/builtins.py:4633
+msgid ""
+":Examples:\n"
+"    Re-do the merge of all conflicted files, and show the base text in\n"
+"    conflict regions, in addition to the usual THIS and OTHER texts::"
+msgstr ""
+
+#: bzrlib/builtins.py:4637
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4639
+msgid ""
+"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
+"    additional processing to reduce the size of conflict regions::"
+msgstr ""
+
+#: bzrlib/builtins.py:4642
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+#: bzrlib/builtins.py:4649
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4661
+msgid ""
+"Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
+"merges."
+msgstr ""
+
+#: bzrlib/builtins.py:4717
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4719
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4723
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4729
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4733
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4738
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4743
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4752
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4766
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+#: bzrlib/builtins.py:4768
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4799
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:4804
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4833
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4835
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4837
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4850
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4852
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4854
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4856
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4859
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4861
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4864
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4871
+msgid "Reverse the order of revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:4873
+msgid "Display changes in the local branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4874
+msgid "Same as --mine-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4876
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+#: bzrlib/builtins.py:4877
+msgid "Same as --theirs-only."
+msgstr ""
+
+#: bzrlib/builtins.py:4882
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4886
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:4889
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4943
+msgid "No peer location known or specified."
+msgstr ""
+
+#: bzrlib/builtins.py:4947
+msgid "Using saved parent location: {0}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:4980
+#, python-format
+msgid "You have %d extra revision:\n"
+msgid_plural "You have %d extra revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:4996
+#, python-format
+msgid "You are missing %d revision:\n"
+msgid_plural "You are missing %d revisions:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/builtins.py:5008
+msgid "This branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5011
+msgid "Other branch has no new revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5016
+msgid "Branches are up to date.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5027
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5029
+msgid ""
+"This operation compresses the data within a bazaar repository. As\n"
+"bazaar supports automatic packing of repository, this operation is\n"
+"normally not required to be done manually."
+msgstr ""
+
+#: bzrlib/builtins.py:5033
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:5039
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+#: bzrlib/builtins.py:5048
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:5062
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:5064
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:5067
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:5069
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:5075
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:5091
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5094
+msgid "Produce long-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5096
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:5122
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5124
+msgid ""
+"This prints out the given file with an annotation on the left side\n"
+"indicating which revision, author and date introduced the change."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+msgid ""
+"If the origin is the same for a run of consecutive lines, it is\n"
+"shown only at the top, unless the --all option is given."
+msgstr ""
+
+#: bzrlib/builtins.py:5135
+msgid "Show annotations on all lines."
+msgstr ""
+
+#: bzrlib/builtins.py:5136
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:5223
+msgid "Cannot sign a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5235
+msgid "Please supply either one revision, or a range."
+msgstr ""
+
+#: bzrlib/builtins.py:5239
+msgid ""
+"Convert the current branch into a checkout of the supplied branch.\n"
+"If no branch is supplied, rebind to the last bound location."
+msgstr ""
+
+#: bzrlib/builtins.py:5242
+msgid ""
+"Once converted into a checkout, commits must succeed on the master branch\n"
+"before they will be applied to the local branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5245
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case binding will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+msgid "No location supplied.  This format does not remember old locations."
+msgstr ""
+
+#: bzrlib/builtins.py:5265
+msgid "Branch is already bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5267
+msgid "No location supplied and no previous location known"
+msgstr ""
+
+#: bzrlib/builtins.py:5273
+msgid "These branches have diverged. Try merging, and then bind again."
+msgstr ""
+
+#: bzrlib/builtins.py:5280
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5282
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:5293
+msgid "Local branch is not bound"
+msgstr ""
+
+#: bzrlib/builtins.py:5297
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5299
+msgid ""
+"--verbose will print out what is being removed.\n"
+"--dry-run will go through all the motions, but not actually\n"
+"remove anything."
+msgstr ""
+
+#: bzrlib/builtins.py:5303
+msgid ""
+"If --revision is specified, uncommit revisions to leave the branch at the\n"
+"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
+"branch at revision 15."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+#: bzrlib/builtins.py:5318
+msgid "Don't actually make changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5319
+msgid "Say yes to all questions."
+msgstr ""
+
+#: bzrlib/builtins.py:5321
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:5323
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:5372
+msgid "No revisions to uncommit.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5387
+msgid "Dry-run, pretending to remove the above revisions.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5390
+msgid "The above revision(s) will be removed.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5394
+msgid "Uncommit these revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:5397
+msgid "Canceled\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5404
+#, python-format
+msgid ""
+"You can restore the old tip by running:\n"
+"  bzr pull . -r revid:%s\n"
+msgstr ""
+
+#: bzrlib/builtins.py:5409
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5411
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:5414
+msgid ""
+"CAUTION: Locks should only be broken when you are sure that the process\n"
+"holding the lock has been stopped."
+msgstr ""
+
+#: bzrlib/builtins.py:5417
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:5420
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+#: bzrlib/builtins.py:5429
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+#: bzrlib/builtins.py:5431
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5466
+msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
+msgstr ""
+
+#: bzrlib/builtins.py:5467
+msgid "Run the bzr server."
+msgstr ""
+
+#: bzrlib/builtins.py:5473
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+#: bzrlib/builtins.py:5474
+msgid "protocol"
+msgstr ""
+
+#: bzrlib/builtins.py:5475
+msgid "Protocol to serve."
+msgstr ""
+
+#: bzrlib/builtins.py:5479
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+#: bzrlib/builtins.py:5485
+msgid "Serve contents of this directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5487
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5496
+msgid "Override the default idle client timeout (5min)."
+msgstr ""
+
+#: bzrlib/builtins.py:5546
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5548
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5550
+msgid ""
+"The TREE argument should be an independent tree, inside another tree, but\n"
+"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
+"running \"bzr branch\" with the target inside a tree.)"
+msgstr ""
+
+#: bzrlib/builtins.py:5554
+msgid ""
+"The result is a combined tree, with the subtree no longer an independent\n"
+"part.  This is marked as a merge of the subtree into the containing tree,\n"
+"and all history is preserved."
+msgstr ""
+
+#: bzrlib/builtins.py:5572
+#, python-format
+msgid ""
+"Can't join trees because %s doesn't support rich root data.\n"
+"You can use bzr upgrade on the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
+msgid "Cannot join {0}.  {1}"
+msgstr ""
+
+#: bzrlib/builtins.py:5592
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5594
+msgid ""
+"This command will produce a target tree in a format that supports\n"
+"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
+"converted into earlier formats like 'dirstate-tags'."
+msgstr ""
+
+#: bzrlib/builtins.py:5598
+msgid ""
+"The TREE argument should be a subdirectory of a working tree.  That\n"
+"subdirectory will be converted into an independent tree, with its own\n"
+"branch.  Commits in the top-level tree will not apply to the new subtree."
+msgstr ""
+
+#: bzrlib/builtins.py:5678
+msgid "No submit branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5686 bzrlib/send.py:108
+msgid "No public branch specified or known"
+msgstr ""
+
+#: bzrlib/builtins.py:5691
+msgid "bzr merge-directive takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/builtins.py:5700
+msgid "No revisions to bundle."
+msgstr ""
+
+#: bzrlib/builtins.py:5719
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5721
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5723
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5725
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5727
+msgid ""
+"* An optional bundle of revision data, so that the changes can be applied\n"
+"  directly from the merge directive, without retrieving data from a\n"
+"  branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5731
+msgid ""
+"`bzr send` creates a compact data set that, when applied using bzr\n"
+"merge, has the same effect as merging from the source branch.  "
+msgstr ""
+
+#: bzrlib/builtins.py:5734
+msgid ""
+"By default the merge directive is self-contained and can be applied to any\n"
+"branch containing submit_branch in its ancestory without needing access to\n"
+"the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5738
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5744
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5750
+msgid ""
+"Both the submit branch and the public branch follow the usual behavior with\n"
+"respect to --remember: If there is no default location set, the first send\n"
+"will set it (use --no-remember to avoid setting it). After that, you can\n"
+"omit the location to use the default.  To change the default, use\n"
+"--remember. The value will only be saved if the location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5761
+msgid ""
+"The default behaviour is to send the merge directive by mail, unless -o is\n"
+"given, in which case it is sent to a file."
+msgstr ""
+
+#: bzrlib/builtins.py:5764
+msgid ""
+"Mail is sent using your preferred mail program.  This should be transparent\n"
+"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
+"If the preferred client can't be found (or used), your editor will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
+"(MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5775
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid ""
+"The merge directives created by bzr send may be applied using bzr merge or\n"
+"bzr pull by specifying a file containing a merge directive as the location."
+msgstr ""
+
+#: bzrlib/builtins.py:5789
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+#: bzrlib/builtins.py:5813
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+#: bzrlib/builtins.py:5817
+msgid ""
+"Refuse to send if there are uncommitted changes in the working tree, --no-"
+"strict disables the check."
+msgstr ""
+
+#: bzrlib/builtins.py:5819
+msgid "Mail the request to this address."
+msgstr ""
+
+#: bzrlib/builtins.py:5823
+msgid "Body for the email."
+msgstr ""
+
+#: bzrlib/builtins.py:5876
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5877
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5880
+msgid "Remember submit and public branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5882
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
+msgid "format"
+msgstr ""
+
+#: bzrlib/builtins.py:5893
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5915
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5917
+msgid ""
+"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
+"(--revision) option can be given -rtag:X, where X is any previously\n"
+"created tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5921
+msgid ""
+"Tags are stored in the branch.  Tags are copied from one branch to another\n"
+"along when you branch, push, pull or merge."
+msgstr ""
+
+#: bzrlib/builtins.py:5924
+msgid ""
+"It is an error to give a tag name that already exists unless you pass\n"
+"--force, in which case the tag is moved to point to the new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5927
+msgid ""
+"To rename a tag (change the name but keep it on the same revsion), run "
+"``bzr\n"
+"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
+msgstr ""
+
+#: bzrlib/builtins.py:5930
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+#: bzrlib/builtins.py:5940
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+#: bzrlib/builtins.py:5943
+msgid "Branch in which to place the tag."
+msgstr ""
+
+#: bzrlib/builtins.py:5945
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5960
+msgid "No tag specified to delete."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+#, python-format
+msgid "Deleted tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5976
+msgid "Please specify a tag name."
+msgstr ""
+
+#: bzrlib/builtins.py:5984
+#, python-format
+msgid "Tag %s already exists for that revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5988
+#, python-format
+msgid "Created tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5990
+#, python-format
+msgid "Updated tag %s."
+msgstr ""
+
+#: bzrlib/builtins.py:5994
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5996
+msgid ""
+"This command shows a table of tag names and the revisions they reference."
+msgstr ""
+
+#: bzrlib/builtins.py:6002
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sort tags by different criteria."
+msgstr ""
+
+#: bzrlib/builtins.py:6004
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:6073
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:6075
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6077
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:6091
+msgid "Tree type"
+msgstr ""
+
+#: bzrlib/builtins.py:6092
+msgid "The relation between branch and tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6094
+msgid "Reconfigure to be an unbound branch with no working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6095
+msgid "Reconfigure to be an unbound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6096
+msgid "Reconfigure to be a bound branch with a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6097
+msgid "Reconfigure to be a lightweight checkout (with no local history)."
+msgstr ""
+
+#: bzrlib/builtins.py:6102
+msgid "Repository type"
+msgstr ""
+
+#: bzrlib/builtins.py:6103
+msgid "Location fo the repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6105
+msgid ""
+"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
+msgstr ""
+
+#: bzrlib/builtins.py:6107
+msgid "Reconfigure to use a shared repository."
+msgstr ""
+
+#: bzrlib/builtins.py:6111
+msgid "Trees in Repository"
+msgstr ""
+
+#: bzrlib/builtins.py:6112
+msgid "Whether new branches in the repository have trees."
+msgstr ""
+
+#: bzrlib/builtins.py:6114
+msgid ""
+"Reconfigure repository to create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6116
+msgid ""
+"Reconfigure repository to not create working trees on branches by default."
+msgstr ""
+
+#: bzrlib/builtins.py:6119
+msgid "Branch to bind checkout to."
+msgstr ""
+
+#: bzrlib/builtins.py:6121
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6124
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6128
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:6138
+msgid "Can't use both --stacked-on and --unstacked"
+msgstr ""
+
+#: bzrlib/builtins.py:6152
+msgid "No target configuration specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6187
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:6189
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6194
+msgid ""
+"In both cases, the working tree is updated and uncommitted changes\n"
+"are merged. The user can commit or revert these as they desire."
+msgstr ""
+
+#: bzrlib/builtins.py:6197
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:6199
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:6204
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+#: bzrlib/builtins.py:6212
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+#: bzrlib/builtins.py:6215
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:6229
+msgid "You must supply either a revision or a location"
+msgstr ""
+
+#: bzrlib/builtins.py:6242
+msgid "cannot create branch without source branch"
+msgstr ""
+
+#: bzrlib/builtins.py:6262
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:6264
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:6271
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:6276
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:6281
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6284
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6286
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6288
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:6290
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6292
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6294
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6296
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:6298
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:6300
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:6302
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6304
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6306
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6308
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6310
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:6312
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:6314
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:6316
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6318
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:6320
+msgid "    bzr view --delete --all"
+msgstr ""
+
+#: bzrlib/builtins.py:6327
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+#: bzrlib/builtins.py:6330
+msgid "Delete the view."
+msgstr ""
+
+#: bzrlib/builtins.py:6333
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+#: bzrlib/builtins.py:6337
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:6356
+msgid "Both --delete and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6359
+msgid "Both --delete and --switch specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6362
+msgid "Deleted all views.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6364
+msgid "No current view to delete"
+msgstr ""
+
+#: bzrlib/builtins.py:6367
+#, python-format
+msgid "Deleted '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6371
+msgid "Both --switch and a file list specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6374
+msgid "Both --switch and --all specified"
+msgstr ""
+
+#: bzrlib/builtins.py:6377
+msgid "No current view to disable"
+msgstr ""
+
+#: bzrlib/builtins.py:6379
+#, python-format
+msgid "Disabled '%s' view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
+msgid "Using '{0}' view: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6386
+msgid "Views defined:\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6395
+msgid "No views defined.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6402
+msgid "Cannot change the 'off' pseudo view"
+msgstr ""
+
+#: bzrlib/builtins.py:6410
+msgid "No current view.\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6413
+msgid "'{0}' view is: {1}\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6433
+msgid "    <no hooks installed>\n"
+msgstr ""
+
+#: bzrlib/builtins.py:6437
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6439
+msgid ""
+"This will remove the branch from the specified location but \n"
+"will keep any working tree or repository in place."
+msgstr ""
+
+#: bzrlib/builtins.py:6444
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:6446
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:6461
+msgid "Plaintext diff output."
+msgstr ""
+
+#: bzrlib/builtins.py:6462
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6464
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:6470
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:6472
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:6477
+msgid ""
+"If filenames are specified, only the changes to those files will be\n"
+"shelved. Other files will be left untouched."
+msgstr ""
+
+#: bzrlib/builtins.py:6480
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:6482
+msgid ""
+"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
+"restore the most recently shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6485
+msgid ""
+"For complicated changes, it is possible to edit the changes in a separate\n"
+"editor program to decide what the file remaining in the working copy\n"
+"should look like.  To do this, add the configuration option"
+msgstr ""
+
+#: bzrlib/builtins.py:6489
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:6491
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:6503
+msgid "Shelve all changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "Method to use for writing diffs."
+msgstr ""
+
+#: bzrlib/builtins.py:6505
+msgid "writer"
+msgstr ""
+
+#: bzrlib/builtins.py:6509
+msgid "List shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6511
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6540
+msgid "No shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6551
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6553
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+#: bzrlib/builtins.py:6562
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
+msgid "action"
+msgstr ""
+
+#: bzrlib/builtins.py:6564
+msgid "Apply changes and remove from the shelf."
+msgstr ""
+
+#: bzrlib/builtins.py:6565
+msgid "Show changes, but do not apply or remove them."
+msgstr ""
+
+#: bzrlib/builtins.py:6566
+msgid ""
+"Instead of unshelving the changes, show the diff that would result from "
+"unshelving."
+msgstr ""
+
+#: bzrlib/builtins.py:6568
+msgid "Delete changes without applying them."
+msgstr ""
+
+#: bzrlib/builtins.py:6569
+msgid "Apply changes but don't delete them."
+msgstr ""
+
+#: bzrlib/builtins.py:6584
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6586
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6589
+msgid ""
+"Another class is 'detritus', which includes files emitted by bzr during\n"
+"normal operations and selftests.  (The value of these files decreases with\n"
+"time.)"
+msgstr ""
+
+#: bzrlib/builtins.py:6593
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6596
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+#: bzrlib/builtins.py:6599
+msgid "Delete all ignored files."
+msgstr ""
+
+#: bzrlib/builtins.py:6600
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+#: bzrlib/builtins.py:6603
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+#: bzrlib/builtins.py:6604
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+#: bzrlib/builtins.py:6606
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/bundle/__init__.py:59
+msgid "A directory cannot be a bundle"
+msgstr ""
+
+#: bzrlib/bundle/apply_bundle.py:40
+msgid "Install revisions"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:64
+msgid "--verbose requires a merge directive"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:67
+msgid "Bundle format not supported"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:77
+msgid "Records\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:81
+msgid "{0}: {1} ({2} multiparent)\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:83
+#, python-format
+msgid "unique files: %d\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:92
+msgid "Revisions\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:93
+#, python-format
+msgid "nicks: %s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:95
+#, python-format
+msgid ""
+"committers: \n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/bundle/commands.py:103
+msgid "Decoded contents\n"
+msgstr ""
+
+#: bzrlib/bundle/serializer/v4.py:327
+#, python-format
+msgid "Bundling %d revision."
+msgid_plural "Bundling %d revisions."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/bzrdir.py:490
+msgid ""
+"making backup of {0}\n"
+"  to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:513
+msgid "renamed {0} to {1}"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1652
+#, python-format
+msgid ""
+"Source repository format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1672
+#, python-format
+msgid ""
+"Source branch format does not support stacking, using format:\n"
+"  %s"
+msgstr ""
+
+#: bzrlib/bzrdir.py:1818
+msgid "starting repository conversion"
+msgstr ""
+
+#: bzrlib/bzrdir.py:2039
+msgid "Using default stacking branch {0} at {1}"
+msgstr ""
+
+#: bzrlib/check.py:108
+msgid "check"
+msgstr ""
+
+#: bzrlib/check.py:110
+msgid "checking revisions"
+msgstr ""
+
+#: bzrlib/check.py:112
+msgid "checking commit contents"
+msgstr ""
+
+#: bzrlib/check.py:114
+msgid "checking file graphs"
+msgstr ""
+
+#: bzrlib/check.py:118
+msgid "checking branches and trees"
+msgstr ""
+
+#: bzrlib/check.py:205
+msgid "checked repository {0} format {1}"
+msgstr ""
+
+#: bzrlib/check.py:208
+#, python-format
+msgid "%6d revisions"
+msgstr ""
+
+#: bzrlib/check.py:209
+#, python-format
+msgid "%6d file-ids"
+msgstr ""
+
+#: bzrlib/check.py:211
+#, python-format
+msgid "%6d unreferenced text versions"
+msgstr ""
+
+#: bzrlib/check.py:215
+msgid "unreferenced version: {{{0}}} in {1}"
+msgstr ""
+
+#: bzrlib/check.py:218
+#, python-format
+msgid "%6d revisions are missing inventory_sha1"
+msgstr ""
+
+#: bzrlib/check.py:221
+#, python-format
+msgid "%6d revisions are mentioned but not present"
+msgstr ""
+
+#: bzrlib/check.py:224
+#, python-format
+msgid "%6d ghost revisions"
+msgstr ""
+
+#: bzrlib/check.py:229
+#, python-format
+msgid "%6d revisions missing parents in ancestry"
+msgstr ""
+
+#: bzrlib/check.py:233
+#, python-format
+msgid "      %s should be in the ancestry for:"
+msgstr ""
+
+#: bzrlib/check.py:237
+#, python-format
+msgid "%6d inconsistent parents"
+msgstr ""
+
+#: bzrlib/check.py:241
+msgid "      * {0} version {1} has parents {2!r} but should have {3!r}"
+msgstr ""
+
+#: bzrlib/check.py:247
+#, python-format
+msgid "%6d revisions have incorrect parents in the revision index"
+msgstr ""
+
+#: bzrlib/check.py:253
+msgid "       {0} has wrong parents in index: {1!r} should be {2!r}"
+msgstr ""
+
+#: bzrlib/check.py:267
+msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
+msgstr ""
+
+#: bzrlib/check.py:296
+msgid ""
+"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
+"{{{4}}}"
+msgstr ""
+
+#: bzrlib/check.py:354
+#, python-format
+msgid "Checking branch at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:374
+#, python-format
+msgid "Checking working tree at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:427 bzrlib/check.py:441
+msgid "No branch found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:429 bzrlib/check.py:439
+msgid "No working tree found at specified location."
+msgstr ""
+
+#: bzrlib/check.py:432
+#, python-format
+msgid "Checking repository at '%s'."
+msgstr ""
+
+#: bzrlib/check.py:443
+msgid "No repository found at specified location."
+msgstr ""
+
+#: bzrlib/clean_tree.py:63
+msgid "Nothing to delete."
+msgstr ""
+
+#: bzrlib/clean_tree.py:68
+msgid "Are you sure you wish to delete these"
+msgstr ""
+
+#: bzrlib/clean_tree.py:70
+msgid "Canceled"
+msgstr ""
+
+#: bzrlib/clean_tree.py:107
+#, python-format
+msgid "unable to remove %s"
+msgstr ""
+
+#: bzrlib/clean_tree.py:111
+msgid "deleting paths:"
+msgstr ""
+
+#: bzrlib/clean_tree.py:125
+msgid "unable to remove \"{0}\": {1}."
+msgstr ""
+
+#: bzrlib/clean_tree.py:130
+msgid "No files deleted."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:47
+msgid "No known version info format {0}. Supported types are: {1}"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Custom template-based format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in Python format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid "Version info in RIO (simple text) format (default)."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:53
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:55
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
+#: en/help_topics/configuration.txt:710
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:67
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:77
+msgid "Select the output format."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:81
+msgid "Include all possible information."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:82
+msgid "Check if tree is clean."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:84
+msgid "Include the revision-history."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:86
+msgid "Include the last revision for each file."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:87
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:101
+msgid "bzr version-info --revision takes exactly one revision specifier"
+msgstr ""
+
+#: bzrlib/commands.py:229
+#, python-format
+msgid "unknown command \"%s\""
+msgstr ""
+
+#: bzrlib/commands.py:476
+msgid "No help for this command."
+msgstr ""
+
+#: bzrlib/commands.py:489
+#, python-format
+msgid ":Purpose: %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:491
+#, python-format
+msgid ""
+":Usage:\n"
+"%s\n"
+msgstr ""
+
+#: bzrlib/commands.py:493
+#, python-format
+msgid ":Usage:   %s\n"
+msgstr ""
+
+#: bzrlib/commands.py:512
+#, python-format
+msgid ":Options:%s"
+msgstr ""
+
+#: bzrlib/commands.py:523
+#, python-format
+msgid ""
+":Description:\n"
+"  %s\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:533
+#, python-format
+msgid ""
+"See bzr help %s for more details and examples.\n"
+"\n"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid ":Aliases:  "
+msgstr ""
+
+#: bzrlib/commands.py:542
+#, python-format
+msgid ":From:     plugin \"%s\"\n"
+msgstr ""
+
+#: bzrlib/commands.py:554
+msgid ":doc:`{0} <{1}-help>`"
+msgstr ""
+
+#: bzrlib/commands.py:558
+#, python-format
+msgid ":See also: %s"
+msgstr ""
+
+#: bzrlib/commands.py:816 bzrlib/gpg.py:324
+msgid "Only ASCII permitted in option names"
+msgstr ""
+
+#: bzrlib/commands.py:841 bzrlib/commands.py:849
+msgid "command {0!r} needs one or more {1}"
+msgstr ""
+
+#: bzrlib/commands.py:858
+msgid "command {0!r} requires argument {1}"
+msgstr ""
+
+#: bzrlib/commands.py:865
+msgid "extra argument to command {0}: {1}"
+msgstr ""
+
+#: bzrlib/commands.py:962
+#, python-format
+msgid "Profile data written to \"%s\"."
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:740
+msgid "added"
+msgstr ""
+
+#: bzrlib/commit.py:117 bzrlib/commit.py:748
+msgid "modified"
+msgstr ""
+
+#: bzrlib/commit.py:131
+#, python-format
+msgid "Committing%s"
+msgstr ""
+
+#: bzrlib/commit.py:134
+#, python-format
+msgid "Committed revision %d."
+msgstr ""
+
+#: bzrlib/commit.py:143
+#, python-format
+msgid "deleted %s"
+msgstr ""
+
+#: bzrlib/commit.py:146
+#, python-format
+msgid "missing %s"
+msgstr ""
+
+#: bzrlib/commit.py:511
+msgid ""
+"Conflicting tags in bound branch:\n"
+"{0}"
+msgstr ""
+
+#: bzrlib/commit.py:742
+msgid "renamed"
+msgstr ""
+
+#: bzrlib/commit.py:977
+msgid "unchanged"
+msgstr ""
+
+#: bzrlib/commit.py:999
+msgid "{0} [{1}] - Stage"
+msgstr ""
+
+#: bzrlib/commit.py:1002
+#, python-format
+msgid "%s - Stage"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:36
+msgid "Sign all commits by a given committer."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:38
+msgid ""
+"If location is not specified the local tree is used.\n"
+"If committer is not specified the default committer is used."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:41
+msgid "This does not sign commits that already have signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:49
+msgid ""
+"Don't actually sign anything, just print the revisions that would be signed."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:103
+msgid "Verify all commit signatures."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:105
+msgid ""
+"Verifies that all commits in the branch are signed by known GnuPG keys."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:110
+msgid ""
+"Comma separated list of GPG key patterns which are acceptable for "
+"verification."
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:147
+msgid "Cannot verify a range of non-revision-history revisions"
+msgstr ""
+
+#: bzrlib/commit_signature_commands.py:168
+msgid "All commits signed with verifiable keys"
+msgstr ""
+
+#: bzrlib/config.py:475
+msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2485
+msgid "{0} is not an SI unit."
+msgstr ""
+
+#: bzrlib/config.py:2949
+msgid ""
+"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
+"will be saved."
+msgstr ""
+
+#: bzrlib/config.py:3093
+#, python-format
+msgid "Invalid '%s', should be of the form 'name=value'"
+msgstr ""
+
+#: bzrlib/config.py:3962
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:3964
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:3966
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:3970
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:3972
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+#: bzrlib/config.py:3984
+msgid "Reduce the scope to the specified configuration file."
+msgstr ""
+
+#: bzrlib/config.py:3988
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+#: bzrlib/config.py:3990
+msgid "Remove the option from the configuration file."
+msgstr ""
+
+#: bzrlib/conflicts.py:50
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:57
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:61
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+#: bzrlib/conflicts.py:66
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:85
+msgid "Marks the conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:88
+msgid "Resolve the conflict preserving the version in the working tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:91
+msgid "Resolve the conflict taking the merged version into account."
+msgstr ""
+
+#: bzrlib/conflicts.py:98
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:104
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:111
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:119
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+#: bzrlib/conflicts.py:126
+msgid "If --all is specified, no FILE may be provided"
+msgstr ""
+
+#: bzrlib/conflicts.py:151
+#, python-format
+msgid "%d conflict auto-resolved."
+msgid_plural "%d conflicts auto-resolved."
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/conflicts.py:154
+msgid "Remaining conflicts:"
+msgstr ""
+
+#: bzrlib/conflicts.py:159
+msgid "All conflicts resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:168
+msgid "{0} conflict resolved, {1} remaining"
+msgid_plural "{0} conflicts resolved, {1} remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/controldir.py:710
+msgid "{0} is{1} redirected to {2}"
+msgstr ""
+
+#: bzrlib/diff.py:399
+#, python-format
+msgid "*** Ignoring files outside view. View is %s"
+msgstr ""
+
+#: bzrlib/errors.py:157
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:178
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:197
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:209
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:227
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:236
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:247
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:261
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:271
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:280
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:290
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:299
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:313
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:322
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:327
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:355
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:363
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:368
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:378
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:387
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:397
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:406
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:415
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:424
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:443
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:456
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:461
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:467
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:483
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:488
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:493
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:498
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:513
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:518
+msgid "Permission denied: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
+msgstr ""
+
+#: bzrlib/errors.py:539
+msgid "URLs differ by more than path: %(from_)r and %(to)r"
+msgstr ""
+
+#: bzrlib/errors.py:561
+msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
+msgstr ""
+
+#: bzrlib/errors.py:571
+msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:579
+msgid ""
+"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
+"upgrade the branch to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:590
+msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:600
+msgid ""
+"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
+"need to upgrade the repository to permit branch stacking."
+msgstr ""
+
+#: bzrlib/errors.py:611
+msgid "Error reading from %(path)r."
+msgstr ""
+
+#: bzrlib/errors.py:630
+msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:646
+msgid "Path \"%(path)s\" is not unicode normalized"
+msgstr ""
+
+#: bzrlib/errors.py:654
+msgid "Not a branch: \"%(path)s\"%(detail)s."
+msgstr ""
+
+#: bzrlib/errors.py:696
+msgid "No submit branch available for branch \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:705
+msgid "A control directory already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:710
+msgid "Already a branch: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:715
+msgid "Parent branch already exists: \"%(path)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:721
+msgid ""
+"Directory contains a branch, but no working tree (use bzr checkout if you "
+"wish to build a working tree): \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:726
+msgid ""
+"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:736
+msgid ""
+"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:746
+msgid "No repository present: \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:753
+msgid ""
+"Unsupported branch format: %(format)s\n"
+"Please run 'bzr upgrade'"
+msgstr ""
+
+#: bzrlib/errors.py:759
+msgid "Unknown %(kind)s format: %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:768
+msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
+msgstr ""
+
+#: bzrlib/errors.py:778
+msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
+msgstr ""
+
+#: bzrlib/errors.py:793
+msgid ""
+"%(target)s\n"
+"is not compatible with\n"
+"%(source)s\n"
+"%(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:809
+msgid "Revision is not compatible with %(repo_format)s"
+msgstr ""
+
+#: bzrlib/errors.py:819
+msgid "%(context_info)s%(path)s is already versioned."
+msgstr ""
+
+#: bzrlib/errors.py:840
+msgid "%(context_info)s%(path)s is not versioned."
+msgstr ""
+
+#: bzrlib/errors.py:861
+msgid "Path(s) are not versioned: %(paths_as_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:872
+msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:891
+msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
+msgstr ""
+
+#: bzrlib/errors.py:899
+msgid ""
+"Filename %(filename)r is not valid in your current filesystem encoding "
+"%(fs_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:910
+msgid "Cannot operate on \"%(filename)s\" because it is a control file"
+msgstr ""
+
+#: bzrlib/errors.py:928
+msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
+msgstr ""
+
+#: bzrlib/errors.py:967
+msgid "Cannot lock %(lock)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:977
+msgid ""
+"A transaction related operation was attempted after the transaction finished."
+msgstr ""
+
+#: bzrlib/errors.py:1004
+msgid "Cannot lock: transport is read only: %(transport)s"
+msgstr ""
+
+#: bzrlib/errors.py:1012
+msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1023
+msgid ""
+"Lock was broken while still open: %(lock)s - check storage consistency!"
+msgstr ""
+
+#: bzrlib/errors.py:1034
+msgid ""
+"Lock was released and re-acquired before being broken: %(lock)s: held by "
+"%(holder)r, wanted to break %(target)r"
+msgstr ""
+
+#: bzrlib/errors.py:1046
+msgid ""
+"Lock is apparently held, but corrupted: %(corruption_info)s\n"
+"Use 'bzr break-lock' to clear it"
+msgstr ""
+
+#: bzrlib/errors.py:1059
+msgid "Lock not held: %(lock)s"
+msgstr ""
+
+#: bzrlib/errors.py:1088
+msgid "No changes to commit"
+msgstr ""
+
+#: bzrlib/errors.py:1093
+msgid ""
+"Selected-file commit of merges is not supported yet: files %(files_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:1103
+msgid ""
+"Excluding paths during commit is not supported by repository at "
+"%(repository)r."
+msgstr ""
+
+#: bzrlib/errors.py:1112
+msgid ""
+"The specified commit message contains characters unsupported by the current "
+"encoding."
+msgstr ""
+
+#: bzrlib/errors.py:1118
+msgid "Upgrade URL cannot work with readonly URLs."
+msgstr ""
+
+#: bzrlib/errors.py:1123
+msgid "The branch format %(format)s is already at the most recent format."
+msgstr ""
+
+#: bzrlib/errors.py:1146
+msgid "Option --change does not accept revision ranges"
+msgstr ""
+
+#: bzrlib/errors.py:1151
+msgid "No namespace registered for string: %(spec)r"
+msgstr ""
+
+#: bzrlib/errors.py:1170
+msgid ""
+"Requested revision: '%(spec)s' does not exist in branch: "
+"%(branch_url)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:1184
+msgid ""
+"Operation denied because it would change the main history, which is not "
+"permitted by the append_revisions_only setting on branch \"%(location)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1195
+msgid ""
+"These branches have diverged. Use the missing command to see how.\n"
+"Use the merge command to reconcile them."
+msgstr ""
+
+#: bzrlib/errors.py:1215
+msgid ""
+"Branches have no common ancestor, and no merge base revision was specified."
+msgstr ""
+
+#: bzrlib/errors.py:1221
+msgid ""
+"Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
+msgstr ""
+
+#: bzrlib/errors.py:1227
+msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1236
+msgid ""
+"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
+msgstr ""
+
+#: bzrlib/errors.py:1245
+msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1254
+msgid "Branch %(branch)s has no commits."
+msgstr ""
+
+#: bzrlib/errors.py:1272
+msgid ""
+"Bound branch %(branch)s is out of date with master branch "
+"%(master)s.%(extra_help)s"
+msgstr ""
+
+#: bzrlib/errors.py:1284
+msgid ""
+"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
+"bound to %(remote)s."
+msgstr ""
+
+#: bzrlib/errors.py:1296
+msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:1305
+msgid ""
+"Unable to connect to target of bound branch %(branch)s => %(target)s: "
+"%(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1317
+msgid "Error in processing weave: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1326
+msgid "Revision {%(revision_id)s} already present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1337
+msgid "Revision {%(revision_id)s} not present in %(weave)s"
+msgstr ""
+
+#: bzrlib/errors.py:1347
+msgid "Weave invariant violated: %(what)s"
+msgstr ""
+
+#: bzrlib/errors.py:1356
+msgid "Parents are mismatched between two revisions. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1378
+msgid ""
+"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
+"%(weave_b)s"
+msgstr ""
+
+#: bzrlib/errors.py:1390
+msgid "Versioned file error"
+msgstr ""
+
+#: bzrlib/errors.py:1395
+msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1405
+msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1415
+msgid "Text did not match its checksum: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1541
+msgid "Export format %(format)r not supported"
+msgstr ""
+
+#: bzrlib/errors.py:1550
+msgid "Transport error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1576
+msgid "Generic bzr smart protocol error: %(details)s"
+msgstr ""
+
+#: bzrlib/errors.py:1584
+msgid "Received bad protocol version marker: %(marker)r"
+msgstr ""
+
+#: bzrlib/errors.py:1616
+msgid "Transport operation not possible: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1621
+msgid "Connection error: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1626
+msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1647
+msgid "Connection closed: %(msg)s %(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1652
+msgid "Connection Timeout: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1657
+msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1667
+msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1682
+msgid "Certificate error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1690
+msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1704
+msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1712
+msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1721
+msgid "%(source)s is%(permanently)s redirected to %(target)s"
+msgstr ""
+
+#: bzrlib/errors.py:1735
+msgid "Too many redirections"
+msgstr ""
+
+#: bzrlib/errors.py:1740
+msgid "Working tree has conflicts."
+msgstr ""
+
+#: bzrlib/errors.py:1744
+msgid "Config file %(filename)s is not UTF-8 encoded\n"
+msgstr ""
+
+#: bzrlib/errors.py:1753
+msgid ""
+"Error(s) parsing config file %(filename)s:\n"
+"%(errors)s"
+msgstr ""
+
+#: bzrlib/errors.py:1763
+msgid ""
+"Bad value \"%(value)s\" for option \"%(name)s\".\n"
+"See ``bzr help %(name)s``"
+msgstr ""
+
+#: bzrlib/errors.py:1773
+msgid "%(username)r does not seem to contain a reasonable email address"
+msgstr ""
+
+#: bzrlib/errors.py:1782
+msgid "Failed to GPG sign data with command \"%(command_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1790
+msgid "Failed to verify GPG signature data with error \"%(error)s\""
+msgstr ""
+
+#: bzrlib/errors.py:1798
+msgid "Unable to import library \"%(library)s\": %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:1806
+msgid "python-gpgme is not installed, it is needed to verify signatures"
+msgstr ""
+
+#: bzrlib/errors.py:1814
+msgid ""
+"The working tree for %(basedir)s has changed since the last commit, but "
+"weave merge requires that it be unchanged"
+msgstr ""
+
+#: bzrlib/errors.py:1824
+msgid ""
+"Can't reprocess and show base, because reprocessing obscures the "
+"relationship of conflicting lines to the base"
+msgstr ""
+
+#: bzrlib/errors.py:1830
+msgid "Cycle in graph %(graph)r"
+msgstr ""
+
+#: bzrlib/errors.py:1858
+msgid "File %(filename)s is not conflicted."
+msgstr ""
+
+#: bzrlib/errors.py:1880
+msgid "No bundle was found in \"%(filename)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:1889
+msgid "Unable to handle bundle version %(version)s: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:1899
+msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
+msgstr ""
+
+#: bzrlib/errors.py:1912
+msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
+msgstr ""
+
+#: bzrlib/errors.py:1922
+msgid "Key %(key)s is already present in map"
+msgstr ""
+
+#: bzrlib/errors.py:1927
+msgid "The prefix %(prefix)s is in the help search path twice."
+msgstr ""
+
+#: bzrlib/errors.py:1937
+msgid ""
+"No final name for trans_id %(trans_id)r\n"
+"file-id: %(file_id)r\n"
+"root trans-id: %(root_trans_id)r\n"
+msgstr ""
+
+#: bzrlib/errors.py:1969
+msgid "Attempt to reuse a transform that has already been applied."
+msgstr ""
+
+#: bzrlib/errors.py:1974
+msgid "Moving the root directory is not supported at this time"
+msgstr ""
+
+#: bzrlib/errors.py:1979
+msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
+msgstr ""
+
+#: bzrlib/errors.py:1990
+msgid ""
+"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2026
+msgid ""
+"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:2056
+msgid "Unable to import paramiko (required for sftp support): %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2064
+msgid "Nothing to merge."
+msgstr ""
+
+#: bzrlib/errors.py:2069
+msgid "Format %(format)s cannot be initialised by this version of bzr."
+msgstr ""
+
+#: bzrlib/errors.py:2078
+msgid ""
+"Cannot convert from format %(from_format)s to format %(format)s.    "
+"%(problem)s"
+msgstr ""
+
+#: bzrlib/errors.py:2090
+msgid "Could not find an appropriate Differ for file \"%(path)s\""
+msgstr ""
+
+#: bzrlib/errors.py:2098
+msgid "%(exe_name)s could not be found on this machine"
+msgstr ""
+
+#: bzrlib/errors.py:2106
+msgid "Diff is not installed on this machine: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2114
+msgid "Diff3 is not installed on this machine."
+msgstr ""
+
+#: bzrlib/errors.py:2120
+msgid "The content being inserted is already present."
+msgstr ""
+
+#: bzrlib/errors.py:2125
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2136
+msgid ""
+"This tree contains left-over files from a failed operation.\n"
+"    Please examine %(pending_deletion)s to see if it contains any files you\n"
+"    wish to keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2146
+msgid ""
+"Unable to delete transform temporary directory %(limbo_dir)s.\n"
+"    Please examine %(limbo_dir)s to see if it contains any files you wish "
+"to\n"
+"    keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2157
+msgid ""
+"Unable to delete transform temporary directory %(pending_deletion)s.  Please "
+"examine %(pending_deletion)s to see if it contains any files you wish to "
+"keep, and delete it when you are done."
+msgstr ""
+
+#: bzrlib/errors.py:2167
+msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2181
+msgid ""
+"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:2194
+msgid "Error in merge modified format"
+msgstr ""
+
+#: bzrlib/errors.py:2199
+msgid "Format error in conflict listings"
+msgstr ""
+
+#: bzrlib/errors.py:2203
+msgid ""
+"Inconsistency in dirstate file %(dirstate_path)s.\n"
+"Error: %(description)s"
+msgstr ""
+
+#: bzrlib/errors.py:2214
+msgid ""
+"An error has been detected in the repository %(repo_path)s.\n"
+"Please run bzr reconcile on this repository."
+msgstr ""
+
+#: bzrlib/errors.py:2225
+msgid ""
+"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2238
+msgid ""
+"An inconsistent delta was supplied: %(delta)r\n"
+"reason: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2250
+msgid "To use this feature you must upgrade your branch at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2259
+msgid "To use this feature you must upgrade your repository at %(path)s."
+msgstr ""
+
+#: bzrlib/errors.py:2264
+msgid ""
+"To use this feature you must upgrade your branch at %(path)s to a format "
+"which supports rich roots."
+msgstr ""
+
+#: bzrlib/errors.py:2270
+msgid "Cannot perform local-only commits on unbound branches."
+msgstr ""
+
+#: bzrlib/errors.py:2275
+msgid "The method %(mname)s is not supported on objects of type %(tname)s."
+msgstr ""
+
+#: bzrlib/errors.py:2296
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2304
+msgid "File is binary but should be text."
+msgstr ""
+
+#: bzrlib/errors.py:2309
+msgid "The path %(path)s is not permitted on this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2318
+msgid ""
+"Testament did not match expected value.\n"
+"       For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
+"       {%(measured)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2330
+msgid "Not a bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2339
+msgid "Bad bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2348
+msgid "Malformed bzr revision-bundle header: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2353
+msgid "Malformed patches in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2358
+msgid "Malformed footer in bzr revision-bundle: %(text)r"
+msgstr ""
+
+#: bzrlib/errors.py:2363
+msgid "End of line marker was not \\n in bzr revision-bundle"
+msgstr ""
+
+#: bzrlib/errors.py:2373
+msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
+msgstr ""
+
+#: bzrlib/errors.py:2383
+msgid "Root class for inventory serialization errors"
+msgstr ""
+
+#: bzrlib/errors.py:2387
+msgid ""
+"The inventory was not in the expected format:\n"
+" %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:2396
+msgid "This operation requires rich root data storage"
+msgstr ""
+
+#: bzrlib/errors.py:2409
+msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
+msgstr ""
+
+#: bzrlib/errors.py:2418
+msgid ""
+"Don't know how to handle SSH connections. Please set BZR_SSH environment "
+"variable."
+msgstr ""
+
+#: bzrlib/errors.py:2425
+msgid ""
+"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
+"ghost at {%(ghost_revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:2435
+msgid "Ghost revision {%(revision_id)s} cannot be used here."
+msgstr ""
+
+#: bzrlib/errors.py:2486
+msgid ""
+"A merge directive must provide either a bundle or a public branch location."
+msgstr ""
+
+#: bzrlib/errors.py:2493
+msgid "Bad merge directive payload %(start)r"
+msgstr ""
+
+#: bzrlib/errors.py:2503
+msgid "Preview patch does not match requested changes."
+msgstr ""
+
+#: bzrlib/errors.py:2509
+msgid "Patch_type was %(patch_type)s, but no patch was supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2519
+msgid ""
+"Your branch does not have all of the revisions required in order to merge "
+"this merge directive and the target location specified in the merge "
+"directive is not a branch: %(location)s."
+msgstr ""
+
+#: bzrlib/errors.py:2531
+msgid "Unsupported entry kind %(kind)s"
+msgstr ""
+
+#: bzrlib/errors.py:2539
+msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2549
+msgid "Subsume target %(other_tree)s needs to be upgraded."
+msgstr ""
+
+#: bzrlib/errors.py:2568
+msgid "No such tag: %(tag_name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2576
+msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
+msgstr ""
+
+#: bzrlib/errors.py:2585
+msgid "Tag %(tag_name)s already exists."
+msgstr ""
+
+#: bzrlib/errors.py:2593
+msgid ""
+"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
+"bugs\" for more information on this feature."
+msgstr ""
+
+#: bzrlib/errors.py:2603
+msgid ""
+"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
+msgstr ""
+
+#: bzrlib/errors.py:2613
+msgid ""
+"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:2623
+msgid "Invalid line in bugs property: '%(line)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2631
+msgid "Invalid bug status: '%(status)s'"
+msgstr ""
+
+#: bzrlib/errors.py:2639
+msgid "Could not understand response from smart server: %(response_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2678
+msgid "Server sent an unexpected error: %(error_tuple)r"
+msgstr ""
+
+#: bzrlib/errors.py:2697
+msgid "Unrecognised container format: %(container_format)r"
+msgstr ""
+
+#: bzrlib/errors.py:2705
+msgid "Unexpected end of container stream"
+msgstr ""
+
+#: bzrlib/errors.py:2710
+msgid "Unknown record type: %(record_type)r"
+msgstr ""
+
+#: bzrlib/errors.py:2718
+msgid "Invalid record: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2726
+msgid "Container has data after end marker: %(excess)r"
+msgstr ""
+
+#: bzrlib/errors.py:2734
+msgid "Container has multiple records with the same name: %(name)s"
+msgstr ""
+
+#: bzrlib/errors.py:2747
+msgid "Corrupt or incompatible data stream: %(reason)s"
+msgstr ""
+
+#: bzrlib/errors.py:2755
+msgid "SMTP error: %(error)s"
+msgstr ""
+
+#: bzrlib/errors.py:2763
+msgid "No message supplied."
+msgstr ""
+
+#: bzrlib/errors.py:2768
+msgid "No mail-to address (--mail-to) or output (-o) specified."
+msgstr ""
+
+#: bzrlib/errors.py:2773
+msgid "Unknown mail client: %(mail_client)s"
+msgstr ""
+
+#: bzrlib/errors.py:2781
+msgid ""
+"Unable to find mail client with the following names: "
+"%(mail_command_list_string)s"
+msgstr ""
+
+#: bzrlib/errors.py:2791
+msgid "SMTP connection to %(host)s refused"
+msgstr ""
+
+#: bzrlib/errors.py:2800
+msgid "Please specify smtp_server.  No server at default %(host)s."
+msgstr ""
+
+#: bzrlib/errors.py:2814
+msgid ""
+"'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
+"reconfigure."
+msgstr ""
+
+#: bzrlib/errors.py:2826
+msgid "'%(display_url)s' is already a branch."
+msgstr ""
+
+#: bzrlib/errors.py:2831
+msgid "'%(display_url)s' is already a tree."
+msgstr ""
+
+#: bzrlib/errors.py:2836
+msgid "'%(display_url)s' is already a checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2841
+msgid "'%(display_url)s' is already a lightweight checkout."
+msgstr ""
+
+#: bzrlib/errors.py:2846
+msgid "'%(display_url)s' is already using a shared repository."
+msgstr ""
+
+#: bzrlib/errors.py:2851
+msgid "'%(display_url)s' is already standalone."
+msgstr ""
+
+#: bzrlib/errors.py:2856
+msgid "Shared repository '%(display_url)s' already creates working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2862
+msgid ""
+"Shared repository '%(display_url)s' already doesn't create working trees."
+msgstr ""
+
+#: bzrlib/errors.py:2868
+msgid "Requested reconfiguration of '%(display_url)s' is not supported."
+msgstr ""
+
+#: bzrlib/errors.py:2873
+msgid "No location could be found to bind to at %(display_url)s."
+msgstr ""
+
+#: bzrlib/errors.py:2878
+msgid ""
+"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
+"status).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2897
+msgid ""
+"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
+"list).%(more)s"
+msgstr ""
+
+#: bzrlib/errors.py:2903
+msgid "Variable {%(name)s} is not available."
+msgstr ""
+
+#: bzrlib/errors.py:2911
+msgid "No template specified."
+msgstr ""
+
+#: bzrlib/errors.py:2916
+msgid "Unable to create symlink %(path_str)son this platform"
+msgstr ""
+
+#: bzrlib/errors.py:2931
+msgid ""
+"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
+"\"original\", \"local\"."
+msgstr ""
+
+#: bzrlib/errors.py:2965
+msgid ""
+"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
+msgstr ""
+
+#: bzrlib/errors.py:2977
+msgid "The \"%(config_id)s\" configuration does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2985
+msgid "The \"%(option_name)s\" configuration option does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:2993
+msgid "The alias \"%(alias_name)s\" does not exist."
+msgstr ""
+
+#: bzrlib/errors.py:3007
+msgid "\"%(alias_name)s\" is not a valid location alias."
+msgstr ""
+
+#: bzrlib/errors.py:3015
+msgid "No %(alias_name)s location assigned."
+msgstr ""
+
+#: bzrlib/errors.py:3023
+msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
+msgstr ""
+
+#: bzrlib/errors.py:3033
+msgid "Unknown rules detected: %(unknowns_str)s."
+msgstr ""
+
+#: bzrlib/errors.py:3044
+msgid "Tip change rejected: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3052
+msgid "Shelf corrupt."
+msgstr ""
+
+#: bzrlib/errors.py:3057
+msgid "Corruption while decompressing repository file%(orig_error)s"
+msgstr ""
+
+#: bzrlib/errors.py:3069
+msgid "No changes are shelved with id \"%(shelf_id)d\"."
+msgstr ""
+
+#: bzrlib/errors.py:3077
+msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
+msgstr ""
+
+#: bzrlib/errors.py:3085
+msgid ""
+"An attempt to access a url outside the server jail was made: '%(url)s'."
+msgstr ""
+
+#: bzrlib/errors.py:3093
+msgid "The user aborted the operation."
+msgstr ""
+
+#: bzrlib/errors.py:3098
+msgid "Branching '%(url)s'(%(format)s) must create a working tree."
+msgstr ""
+
+#: bzrlib/errors.py:3108
+msgid "No such view: %(view_name)s."
+msgstr ""
+
+#: bzrlib/errors.py:3118
+msgid ""
+"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
+"to a later format."
+msgstr ""
+
+#: bzrlib/errors.py:3127
+msgid ""
+"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
+msgstr ""
+
+#: bzrlib/errors.py:3194
+msgid "%(bzrdir)r does not support co-located branches."
+msgstr ""
+
+#: bzrlib/errors.py:3200
+msgid ""
+"Unable to determine your name.\n"
+"Please, set your name with the 'whoami' command.\n"
+"E.g. bzr whoami \"Your Name <name@example.com>\""
+msgstr ""
+
+#: bzrlib/errors.py:3209
+msgid "Invalid pattern(s) found. %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:3217
+msgid ""
+"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
+"unbind` to fix."
+msgstr ""
+
+#: bzrlib/errors.py:3228
+msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3237
+msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:3246
+msgid ""
+"No compatible object available for operations from %(source)r to %(target)r."
+msgstr ""
+
+#: bzrlib/errors.py:3256
+msgid ""
+"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
+"%(arguments)s."
+msgstr ""
+
+#: bzrlib/errors.py:3266
+msgid ""
+"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
+"format %(format)r"
+msgstr ""
+
+#: bzrlib/errors.py:3278
+msgid ""
+"Missing feature %(feature)s not provided by this version of Bazaar or any "
+"plugin."
+msgstr ""
+
+#: bzrlib/errors.py:3291
+msgid "Binary files section encountered."
+msgstr ""
+
+#: bzrlib/errors.py:3299
+msgid ""
+"Malformed patch header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3308
+msgid ""
+"Malformed hunk header.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3317
+msgid ""
+"Malformed line.  %(desc)s\n"
+"%(line)r"
+msgstr ""
+
+#: bzrlib/errors.py:3327
+msgid ""
+"Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
+"but patch says it should be \"%(patch_line)s\""
+msgstr ""
+
+#: bzrlib/errors.py:3338
+msgid "The feature %(feature)s has already been registered."
+msgstr ""
+
+#: bzrlib/export_pot.py:252
+#, python-format
+msgid "Exporting messages from builtin command: %s"
+msgstr ""
+
+#: bzrlib/export_pot.py:271
+msgid "Exporting messages from plugin command: {0} in {1}"
+msgstr ""
+
+#: bzrlib/export_pot.py:292
+#, python-format
+msgid "Exporting message from error: %s"
+msgstr ""
+
+#: bzrlib/fetch.py:98
+msgid "Finding revisions"
+msgstr ""
+
+#: bzrlib/fetch.py:103
+msgid "Fetching revisions"
+msgstr ""
+
+#: bzrlib/foreign.py:262
+msgid "Push into a different VCS without any custom bzr metadata."
+msgstr ""
+
+#: bzrlib/foreign.py:264
+msgid ""
+"This will afterwards rebase the local branch on the remote\n"
+"branch unless the --no-rebase option is used, in which case \n"
+"the two branches will be out of sync after the push. "
+msgstr ""
+
+#: bzrlib/foreign.py:277
+msgid "Do not rebase after push."
+msgstr ""
+
+#: bzrlib/foreign.py:311
+#, python-format
+msgid "Using saved location: %s\n"
+msgstr ""
+
+#: bzrlib/foreign.py:321
+msgid ""
+"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
+"regular push."
+msgstr ""
+
+#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
+msgid "{0} commits with valid signatures"
+msgstr ""
+
+#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
+msgid "{0} commit with unknown key"
+msgid_plural "{0} commits with unknown keys"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
+msgid "{0} commit not valid"
+msgid_plural "{0} commits not valid"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
+msgid "{0} commit not signed"
+msgid_plural "{0} commits not signed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
+msgid "{0} commit with key now expired"
+msgid_plural "{0} commits with key now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:343
+msgid "No GnuPG key results for pattern: {0}"
+msgstr ""
+
+#: bzrlib/gpg.py:386
+msgid "{0} signed {1} commit"
+msgid_plural "{0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
+msgid "{0} commit by author {1}"
+msgid_plural "{0} commits by author {1}"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:433
+msgid "Unknown key {0} signed {1} commit"
+msgid_plural "Unknown key {0} signed {1} commits"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/gpg.py:452
+msgid "{0} commit by author {1} with key {2} now expired"
+msgid_plural "{0} commits by author {1} with key {2} now expired"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/groupcompress.py:1739
+#, python-format
+msgid "Insert claimed random_id=True, but then inserted %r two times"
+msgstr ""
+
+#: bzrlib/hooks.py:331
+#, python-format
+msgid "Introduced in: %s"
+msgstr ""
+
+#: bzrlib/hooks.py:334
+#, python-format
+msgid "Deprecated in: %s"
+msgstr ""
+
+#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
+msgid "Walking content"
+msgstr ""
+
+#: bzrlib/knit.py:3330
+msgid "annotating"
+msgstr ""
+
+#: bzrlib/lock.py:548
+msgid "{0!r} was {1} locked again"
+msgstr ""
+
+#: bzrlib/lockdir.py:321
+#, python-format
+msgid "error removing pending lock: %s"
+msgstr ""
+
+#: bzrlib/lockdir.py:616
+msgid "Unable to obtain"
+msgstr ""
+
+#: bzrlib/lockdir.py:618
+msgid "Lock owner changed for"
+msgstr ""
+
+#: bzrlib/lockdir.py:620
+msgid "{0} lock {1} {2}."
+msgstr ""
+
+#: bzrlib/lockdir.py:627
+#, python-format
+msgid "Will continue to try until %s, unless you press Ctrl-C."
+msgstr ""
+
+#: bzrlib/lockdir.py:629
+msgid "See \"bzr help break-lock\" for more."
+msgstr ""
+
+#: bzrlib/lockdir.py:739
+#, python-format
+msgid ""
+"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
+msgstr ""
+
+#: bzrlib/log.py:572
+msgid "--exclude-common-ancestry requires two different revisions"
+msgstr ""
+
+#: bzrlib/log.py:574
+#, python-format
+msgid "invalid direction %r"
+msgstr ""
+
+#: bzrlib/log.py:662
+msgid "Start revision not found in history of end revision."
+msgstr ""
+
+#: bzrlib/log.py:1080 bzrlib/log.py:1138
+msgid "Logging revision 0 is invalid."
+msgstr ""
+
+#: bzrlib/log.py:1082 bzrlib/log.py:1140
+msgid "Start revision must be older than the end revision."
+msgstr ""
+
+#: bzrlib/log.py:1827
+#, python-format
+msgid "unknown log formatter: %r"
+msgstr ""
+
+#: bzrlib/log.py:2123
+msgid "fixes bug"
+msgid_plural "fixes bugs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bzrlib/merge.py:689
+msgid "All changes applied successfully."
+msgstr ""
+
+#: bzrlib/merge.py:691
+#, python-format
+msgid "%d conflicts encountered."
+msgstr ""
+
+#: bzrlib/merge.py:845 bzrlib/merge.py:1933
+msgid "Preparing file merge"
+msgstr ""
+
+#: bzrlib/multiparent.py:426
+msgid "Importing revisions"
+msgstr ""
+
+#: bzrlib/option.py:526
+msgid "Show help message."
+msgstr ""
+
+#: bzrlib/option.py:528
+msgid "Only display errors and warnings."
+msgstr ""
+
+#: bzrlib/option.py:531
+msgid "Show usage message and options."
+msgstr ""
+
+#: bzrlib/option.py:533
+msgid "Display more information."
+msgstr ""
+
+#: bzrlib/option.py:541
+msgid ""
+"Select changes introduced by the specified revision. See also \"help "
+"revisionspec\"."
+msgstr ""
+
+#: bzrlib/option.py:543
+msgid "Branch to operate on, instead of working directory."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Detailed log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Format used by GNU ChangeLog files."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Log format with one line per revision."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Moderately short log format."
+msgstr ""
+
+#: bzrlib/option.py:545
+msgid "Use specified log format."
+msgstr ""
+
+#: bzrlib/option.py:547
+msgid "Log format"
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "LCA-newness merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Merge using external diff3."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Native diff3-style merge."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Select a particular merge algorithm."
+msgstr ""
+
+#: bzrlib/option.py:549
+msgid "Weave-based merge."
+msgstr ""
+
+#: bzrlib/option.py:551
+msgid "Merge algorithm"
+msgstr ""
+
+#: bzrlib/option.py:554
+msgid "Message string."
+msgstr ""
+
+#: bzrlib/option.py:556
+msgid "Use an ASCII NUL (\\0) separator rather than a newline."
+msgstr ""
+
+#: bzrlib/option.py:558
+msgid "Ignore differences between branches and overwrite unconditionally."
+msgstr ""
+
+#: bzrlib/option.py:560
+msgid "Remember the specified location as a default."
+msgstr ""
+
+#: bzrlib/option.py:562
+msgid "Reprocess to reduce spurious conflicts."
+msgstr ""
+
+#: bzrlib/option.py:566
+msgid "See \"help revisionspec\" for details."
+msgstr ""
+
+#: bzrlib/option.py:568
+msgid "Show internal object ids."
+msgstr ""
+
+#: bzrlib/option.py:571
+msgid "Display timezone as local, original, or utc."
+msgstr ""
+
+#: bzrlib/osutils.py:100
+msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
+msgstr ""
+
+#: bzrlib/osutils.py:220
+msgid "lstat/stat of ({0!r}): {1!r}"
+msgstr ""
+
+#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
+#, python-format
+msgid "sorry, %r not allowed in path"
+msgstr ""
+
+#: bzrlib/osutils.py:1237
+#, python-format
+msgid "%r is too short to calculate a relative path"
+msgstr ""
+
+#: bzrlib/plugin.py:143
+#, python-format
+msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:411
+msgid "Enable completions for the selected plugin (default: all plugins)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:412
+msgid "Generate a shell function for bash command line completion."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:414
+msgid ""
+"This command generates a shell function which can be used by bash to\n"
+"automatically complete the currently typed command when the user presses\n"
+"the completion key (usually tab)."
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:418
+msgid ""
+"Commonly used like this:\n"
+"    eval \"`bzr bash-completion`\""
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:424
+msgid "Name of the generated function (default: _bzr)"
+msgstr ""
+
+#: bzrlib/plugins/bash_completion/bashcomp.py:426
+msgid "Generate only the shell function, don't enable it"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:81
+msgid "Register a branch with launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:83
+msgid ""
+"This command lists a bzr branch in the directory of branches on\n"
+"launchpad.net.  Registration allows the branch to be associated with\n"
+"bugs or specifications."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:87
+msgid ""
+"Before using this command you must register the project to which the\n"
+"branch belongs, and create an account for yourself on launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:90
+msgid ""
+"arguments:\n"
+"    public_url: The publicly visible url for the branch to register.\n"
+"                This must be an http or https url (which Launchpad can read\n"
+"                from to access the branch). Local file urls, SFTP urls, and\n"
+"                bzr+ssh urls will not work.\n"
+"                If no public_url is provided, bzr will use the configured\n"
+"                public_url if there is one for the current branch, and\n"
+"                otherwise error."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:99
+msgid ""
+"example:\n"
+"    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
+"            --project fooproject"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:106
+msgid "Launchpad project short name to associate with the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:113
+msgid ""
+"Short name for the branch; by default taken from the last component of the "
+"url."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:117
+msgid "One-sentence description of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:120
+msgid "Longer description of the purpose or contents of the branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:123
+msgid "Branch author's email address, if not yourself."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:126
+msgid "The bug this branch fixes."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:129
+msgid "Prepare the request but don't actually send it."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:151
+msgid ""
+"register-branch requires a public branch url - see bzr help register-branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:159
+msgid "--product is deprecated; please use --project."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:191
+msgid "Open a Launchpad branch page in your web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:196
+msgid "Do not actually open the browser. Just say the URL we would use."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:231
+#, python-format
+msgid "Opening %s in web browser"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:241
+msgid "Show or set the Launchpad user ID."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:243
+msgid ""
+"When communicating with Launchpad, some commands need to know your\n"
+"Launchpad user ID.  This command can be used to set or show the\n"
+"user ID that Bazaar will use for such communication."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:247
+msgid ""
+":Examples:\n"
+"  Show the Launchpad ID of the current user::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:250
+msgid "      bzr launchpad-login"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:252
+msgid "  Set the Launchpad ID of the current user to 'bob'::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:254
+msgid "      bzr launchpad-login bob"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:261
+msgid "Don't check that the user name is valid."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:276
+#: bzrlib/plugins/launchpad/__init__.py:287
+msgid "Launchpad user ID exists and has SSH keys.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:279
+msgid "No Launchpad user ID configured.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:290
+#, python-format
+msgid "Launchpad user ID set to '%s'.\n"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:298
+msgid "Ask Launchpad to mirror a branch now."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:318
+msgid "Propose merging a branch on Launchpad."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:320
+msgid ""
+"This will open your usual editor to provide the initial comment.  When it\n"
+"has created the proposal, it will open it in your default web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:323
+msgid ""
+"The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
+"is not supplied, the remembered submit branch will be used.  If no submit\n"
+"branch is remembered, the development focus will be used."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:327
+msgid ""
+"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
+"the merge proposal.  This can be overriden by specifying --review (-R).\n"
+"The parameter the launchpad account name of the desired reviewer.  This\n"
+"may optionally be followed by '=' and the review type.  For example:"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:332
+msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:334
+msgid ""
+"This will propose a merge,  request \"jrandom\" to perform a review of\n"
+"unspecified type, and request \"review-team\" to perform a \"qa\" review."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:339
+msgid "Propose the merge on staging."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:341
+msgid "Commit message."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:343
+msgid "Mark the proposal as approved immediately."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:345
+msgid "Requested reviewer and optional type."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:382
+msgid "Find the proposal to merge this revision."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:384
+msgid ""
+"Finds the merge proposal(s) that discussed landing the specified revision.\n"
+"This works only if the selected branch was the merge proposal target, and\n"
+"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
+"are opened in a web browser."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:389
+msgid ""
+"Any revision involved in the merge may be specified-- the revision in\n"
+"which the merge was performed, or one of the revisions that was merged."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:392
+msgid "So, to find the merge proposal that reviewed line 1 of README::"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:394
+msgid "  bzr lp-find-proposal -r annotate:README:1"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:409
+msgid "No review found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:410
+#, python-format
+msgid "%d proposals(s) found."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:420
+msgid "Finding revision-id"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:427
+msgid "Finding merge"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:432
+msgid "Finding revno"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:437
+msgid "Finding Launchpad branch"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/__init__.py:440
+msgid "Finding proposals"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/account.py:66
+msgid "Setting ssh/sftp usernames for launchpad.net."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:241
+#: bzrlib/plugins/launchpad/lp_api.py:246
+#, python-format
+msgid "%s is not registered on Launchpad"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:256
+#, python-format
+msgid "%s has no development focus."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:261
+#, python-format
+msgid "development focus %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:266
+#, python-format
+msgid "source package %s has no branch."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:270
+#, python-format
+msgid "%s has no associated product or source package."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:282
+#, python-format
+msgid "%s is already up-to-date."
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_api.py:289
+#, python-format
+msgid "Pushing to %s"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_directory.py:170
+msgid ""
+"resolution for {0}\n"
+"  local: {1}\n"
+" remote: {2}"
+msgstr ""
+
+#: bzrlib/plugins/launchpad/lp_propose.py:149
+#, python-format
+msgid "There is already a branch merge proposal: %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:236
+msgid "pb parameter to convert() is deprecated"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:239
+msgid "starting upgrade from format 4 to 5"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:249
+msgid "note: upgrade may be faster if all store files are ungzipped first"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:278
+msgid "converting revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:283
+msgid "upgraded to weaves:"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:284
+#, python-format
+msgid "%6d revisions and inventories"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:286
+#, python-format
+msgid "%6d revisions not present"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:288
+#, python-format
+msgid "%6d texts"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:324
+msgid "writing weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:328
+#: bzrlib/plugins/weave_fmt/bzrdir.py:330
+msgid "inventory"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:347
+msgid "write revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:361
+msgid "loading revision"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:366
+#, python-format
+msgid "revision {%s} not present in branch; will be converted as a ghost"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:506
+msgid "starting upgrade from format 5 to 6"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:516
+#, python-format
+msgid "adding prefixes to %s"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:556
+msgid "starting upgrade from format 6 to metadir"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:564
+msgid "Removing ancestry.weave"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:569
+msgid "Finding branch files"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:579
+msgid "Upgrading repository"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:589
+msgid "Upgrading branch"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:612
+msgid "No working tree."
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:619
+msgid "Upgrading working tree"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:640
+#, python-format
+msgid "Make %s lock"
+msgstr ""
+
+#: bzrlib/plugins/weave_fmt/bzrdir.py:651
+#, python-format
+msgid "Moving %s"
+msgstr ""
+
+#: bzrlib/push.py:56
+msgid "Created new branch."
+msgstr ""
+
+#: bzrlib/push.py:97
+#, python-format
+msgid ""
+"Target directory %s already contains a .bzr directory, but it is not valid."
+msgstr ""
+
+#: bzrlib/push.py:101
+#, python-format
+msgid ""
+"Target directory %s already exists, but does not have a .bzr directory. "
+"Supply --use-existing-dir to push there anyway."
+msgstr ""
+
+#: bzrlib/push.py:122
+#, python-format
+msgid "Too many redirections trying to make %s."
+msgstr ""
+
+#: bzrlib/push.py:147
+msgid ""
+"These branches have diverged.  See \"bzr help diverged-branches\" for more "
+"information."
+msgstr ""
+
+#: bzrlib/push.py:151
+#, python-format
+msgid ""
+"It is not possible to losslessly push to %s. You may want to use dpush "
+"instead."
+msgstr ""
+
+#: bzrlib/push.py:157
+#, python-format
+msgid ""
+"At %s you have a valid .bzr control directory, but not a branch or "
+"repository. This is an unsupported configuration. Please move the target "
+"directory out of the way and try again."
+msgstr ""
+
+#: bzrlib/reconcile.py:97
+#, python-format
+msgid "Reconciling branch %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:103
+#, python-format
+msgid "Reconciling repository %s"
+msgstr ""
+
+#: bzrlib/reconcile.py:105
+msgid "Reconciling repository"
+msgstr ""
+
+#: bzrlib/reconcile.py:111
+#, python-format
+msgid "%s cannot canonicalize CHKs."
+msgstr ""
+
+#: bzrlib/reconcile.py:119
+msgid "Reconcile aborted: revision index has inconsistent parents."
+msgstr ""
+
+#: bzrlib/reconcile.py:121
+msgid "Run \"bzr check\" for more details."
+msgstr ""
+
+#: bzrlib/reconcile.py:123
+msgid "Reconciliation complete."
+msgstr ""
+
+#: bzrlib/reconcile.py:166
+msgid "Fixing last revision info {0}  => {1}"
+msgstr ""
+
+#: bzrlib/reconcile.py:173
+msgid "revision_history ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:234
+msgid "Reading inventory data"
+msgstr ""
+
+#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
+msgid "Inventory ok."
+msgstr ""
+
+#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
+msgid "Backing up inventory"
+msgstr ""
+
+#: bzrlib/reconcile.py:258
+msgid "Backup inventory created."
+msgstr ""
+
+#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
+msgid "Writing weave"
+msgstr ""
+
+#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
+msgid "Inventory regenerated."
+msgstr ""
+
+#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
+msgid "Reading indexes"
+msgstr ""
+
+#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
+msgid "Checking unused inventories"
+msgstr ""
+
+#: bzrlib/reconcile.py:388
+msgid "Backup Inventory created"
+msgstr ""
+
+#: bzrlib/reconcile.py:446
+msgid "Fixing text parents"
+msgstr ""
+
+#: bzrlib/reconfigure.py:54
+msgid "{0} is now stacked on {1}\n"
+msgstr ""
+
+#: bzrlib/reconfigure.py:69
+#, python-format
+msgid "%s is now not stacked\n"
+msgstr ""
+
+#: bzrlib/remote.py:1228 bzrlib/repository.py:289
+#, python-format
+msgid "bzr: ERROR (ignored): %s"
+msgstr ""
+
+#: bzrlib/remote.py:2541
+msgid "Copying repository content as tarball..."
+msgstr ""
+
+#: bzrlib/rename_map.py:69
+msgid "Calculating hashes"
+msgstr ""
+
+#: bzrlib/rename_map.py:107
+msgid "Determining hash hits"
+msgstr ""
+
+#: bzrlib/rename_map.py:242
+msgid "{0} => {1}"
+msgstr ""
+
+#: bzrlib/repository.py:1787
+msgid "Moving repository to repository.backup"
+msgstr ""
+
+#: bzrlib/repository.py:1794
+msgid "Creating new repository"
+msgstr ""
+
+#: bzrlib/repository.py:1799
+msgid "Copying content"
+msgstr ""
+
+#: bzrlib/repository.py:1803
+msgid "Deleting old repository content"
+msgstr ""
+
+#: bzrlib/repository.py:1805
+msgid "repository converted"
+msgstr ""
+
+#: bzrlib/revisionspec.py:903
+msgid "Using {0} {1}"
+msgstr ""
+
+#: bzrlib/send.py:58
+#, python-format
+msgid "Mail client \"%s\" does not support specifying body"
+msgstr ""
+
+#: bzrlib/send.py:62
+msgid "--remember requires a branch to be specified."
+msgstr ""
+
+#: bzrlib/send.py:77
+msgid "No submit branch known or specified"
+msgstr ""
+
+#: bzrlib/send.py:80
+msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
+msgstr ""
+
+#: bzrlib/send.py:98
+#, python-format
+msgid "No such send format '%s'."
+msgstr ""
+
+#: bzrlib/send.py:114
+msgid "bzr send takes at most two one revision identifiers"
+msgstr ""
+
+#: bzrlib/send.py:127
+msgid "No revisions to submit."
+msgstr ""
+
+#: bzrlib/send.py:139
+msgid ""
+"- not supported for merge directives that use more than one output file."
+msgstr ""
+
+#: bzrlib/send.py:185
+msgid "Format 0.9 does not permit bundle with no patch"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:46
+#, python-format
+msgid "Shelve adding file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:47
+msgid "Shelve binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:48
+msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:50
+#, python-format
+msgid "Shelve removing file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:51
+#, python-format
+msgid "Shelve %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:52
+msgid "Shelve?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:53
+#, python-format
+msgid ""
+"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:55
+#, python-format
+msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:70
+#, python-format
+msgid "Changes shelved with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:74
+msgid "Selected changes destroyed."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:78
+msgid "Selected changes:"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:98
+#, python-format
+msgid "Delete file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:99
+msgid "Apply binary changes?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:100
+#, python-format
+msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:102
+#, python-format
+msgid "Add file \"%(path)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:103
+#, python-format
+msgid "Apply %d change(s)?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:104
+msgid "Apply change?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:105
+#, python-format
+msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:107
+#, python-format
+msgid "Rename \"%(this)s\" => \"%(other)s\"?"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:402
+msgid "No changes are shelved."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:460
+#, python-format
+msgid "Using changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/shelf_ui.py:464
+#, python-format
+msgid "Message: %s"
+msgstr ""
+
+#: bzrlib/shelf_ui.py:476
+#, python-format
+msgid "Deleted changes with id \"%d\"."
+msgstr ""
+
+#: bzrlib/smart/medium.py:714
+msgid "HPSS calls: {0} ({1} vfs) {2}"
+msgstr ""
+
+#: bzrlib/smart/server.py:169
+msgid "Requested to stop gracefully"
+msgstr ""
+
+#: bzrlib/smart/server.py:179
+#, python-format
+msgid "Waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:185
+#, python-format
+msgid "Still waiting for %d client(s) to finish"
+msgstr ""
+
+#: bzrlib/smart/server.py:219
+#, python-format
+msgid "listening socket error: %s"
+msgstr ""
+
+#: bzrlib/smart/server.py:452
+#, python-format
+msgid "listening on port: %s"
+msgstr ""
+
+#: bzrlib/switch.py:73
+msgid "Pending merges must be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/switch.py:100
+msgid ""
+"Cannot switch as local commits found in the checkout. Commit these to the "
+"bound branch or use --force to throw them away."
+msgstr ""
+
+#: bzrlib/switch.py:105
+#, python-format
+msgid ""
+"Unable to connect to current master branch %(target)s: %(error)s To switch "
+"anyway, use --force."
+msgstr ""
+
+#: bzrlib/switch.py:125
+msgid "Cannot switch a branch, only a checkout."
+msgstr ""
+
+#: bzrlib/switch.py:163
+#, python-format
+msgid "Tree is up to date at revision %d."
+msgstr ""
+
+#: bzrlib/switch.py:169
+#, python-format
+msgid "Updated to revision %d."
+msgstr ""
+
+#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
+msgid "Apply phase"
+msgstr ""
+
+#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
+msgid "removing file"
+msgstr ""
+
+#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
+msgid "adding file"
+msgstr ""
+
+#: bzrlib/transform.py:2591
+msgid "Building tree"
+msgstr ""
+
+#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
+msgid "Adding file contents"
+msgstr ""
+
+#: bzrlib/transform.py:3028
+msgid "Resolution pass"
+msgstr ""
+
+#: bzrlib/transport/ftp/_gssapi.py:88
+#, python-format
+msgid "Authenticated as %s"
+msgstr ""
+
+#: bzrlib/tree.py:634
+msgid "*** {0} content-filter: {1} => {2!r}"
+msgstr ""
+
+#: bzrlib/upgrade.py:77
+#, python-format
+msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
+msgstr ""
+
+#: bzrlib/upgrade.py:100
+#, python-format
+msgid "cannot upgrade from bzrdir format %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:103
+#, python-format
+msgid "starting upgrade of %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:110
+msgid "finished"
+msgstr ""
+
+#: bzrlib/upgrade.py:120
+msgid "Deleting backup.bzr"
+msgstr ""
+
+#: bzrlib/upgrade.py:151
+msgid ""
+"\n"
+"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
+msgstr ""
+
+#: bzrlib/upgrade.py:208
+#, python-format
+msgid "Found %d dependent branches - upgrading ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:276
+msgid "Upgrading bzrdirs"
+msgstr ""
+
+#: bzrlib/upgrade.py:282
+#, python-format
+msgid "Upgrading %s"
+msgstr ""
+
+#: bzrlib/upgrade.py:283
+msgid "Upgrading {0} {1} ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:301
+msgid "Removing backup ..."
+msgstr ""
+
+#: bzrlib/upgrade.py:305
+msgid "failed to clean-up {0}: {1}"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1090
+msgid "inventories"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1116
+msgid "texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
+msgid "Calculating text parents"
+msgstr ""
+
+#: bzrlib/vf_repository.py:1706
+msgid "Fetch texts"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2535
+msgid "loading text store"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2541
+msgid "checking text graph"
+msgstr ""
+
+#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
+#: bzrlib/vf_repository.py:3124
+msgid "Transferring revisions"
+msgstr ""
+
+#: bzrlib/win32utils.py:146
+msgid "Failed to GetProcessMemoryInfo()"
+msgstr ""
+
+#: bzrlib/win32utils.py:167
+msgid "Cannot debug memory on win32 without ctypes or win32process"
+msgstr ""
+
+#: bzrlib/win32utils.py:172
+msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
+msgstr ""
+
+#: bzrlib/win32utils.py:180
+#, python-format
+msgid "WorkingSize       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:181
+#, python-format
+msgid "PeakWorking       %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:182
+#, python-format
+msgid "PagefileUsage     %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:183
+#, python-format
+msgid "PeakPagefileUsage %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:185
+#, python-format
+msgid "PrivateUsage      %8d KiB"
+msgstr ""
+
+#: bzrlib/win32utils.py:186
+#, python-format
+msgid "PageFaultCount    %8d"
+msgstr ""
+
+#: bzrlib/workingtree.py:1478
+msgid "Rerun update after fixing the conflicts."
+msgstr ""
+
+#: dummy/help_topics/authentication/summary.txt:1
+msgid "Information on configuring authentication"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:1
+msgid ""
+"Bazaar 2.5b6 -- a free distributed version-control tool\n"
+"http://bazaar.canonical.com/"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:4
+msgid ""
+"Basic commands:\n"
+"  bzr init           makes this directory a versioned branch\n"
+"  bzr branch         make a copy of another branch"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:8
+msgid ""
+"  bzr add            make files or directories versioned\n"
+"  bzr ignore         ignore a file or pattern\n"
+"  bzr mv             move or rename a versioned file"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:12
+msgid ""
+"  bzr status         summarize changes in working copy\n"
+"  bzr diff           show detailed diffs"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:15
+msgid ""
+"  bzr merge          pull in changes from another branch\n"
+"  bzr commit         save some or all changes\n"
+"  bzr send           send changes via email"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:19
+msgid ""
+"  bzr log            show history of changes\n"
+"  bzr check          validate storage"
+msgstr ""
+
+#: dummy/help_topics/basic/detail.txt:22
+msgid ""
+"  bzr help init      more help on e.g. init command\n"
+"  bzr help commands  list all commands\n"
+"  bzr help topics    list all help topics\n"
+msgstr ""
+
+#: dummy/help_topics/basic/summary.txt:1
+msgid "Basic commands"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:1
+msgid "Branches"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:3
+msgid ""
+"A branch consists of the state of a project, including all of its\n"
+"history. All branches have a repository associated (which is where the\n"
+"branch history is stored), but multiple branches may share the same\n"
+"repository (a shared repository). Branches can be copied and merged."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:8
+msgid ""
+"In addition, one branch may be bound to another one.  Binding to another\n"
+"branch indicates that commits which happen in this branch must also \n"
+"happen in the other branch.  Bazaar ensures consistency by not allowing \n"
+"commits when the two branches are out of date.  In order for a commit \n"
+"to succeed, it may be necessary to update the current branch using \n"
+"``bzr update``."
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:15
+#: dummy/help_topics/checkouts/detail.txt:66
+#: dummy/help_topics/repositories/detail.txt:36
+msgid "Related commands::"
+msgstr ""
+
+#: dummy/help_topics/branches/detail.txt:17
+msgid ""
+"  init    Change a directory into a versioned branch.\n"
+"  branch  Create a new branch that is a copy of an existing branch.\n"
+"  merge   Perform a three-way merge.\n"
+"  bind    Bind a branch to another one.\n"
+msgstr ""
+
+#: dummy/help_topics/branches/summary.txt:1
+msgid "Information on what a branch is"
+msgstr ""
+
+#: dummy/help_topics/bugs/summary.txt:1
+msgid "Bug tracker settings"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:1
+msgid "Checkouts"
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:3
+msgid ""
+"Checkouts are source trees that are connected to a branch, so that when\n"
+"you commit in the source tree, the commit goes into that branch.  They\n"
+"allow you to use a simpler, more centralized workflow, ignoring some of\n"
+"Bazaar's decentralized features until you want them. Using checkouts\n"
+"with shared repositories is very similar to working with SVN or CVS, but\n"
+"doesn't have the same restrictions.  And using checkouts still allows\n"
+"others working on the project to use whatever workflow they like."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:11
+msgid ""
+"A checkout is created with the bzr checkout command (see \"help "
+"checkout\").\n"
+"You pass it a reference to another branch, and it will create a local copy\n"
+"for you that still contains a reference to the branch you created the\n"
+"checkout from (the master branch). Then if you make any commits they will "
+"be\n"
+"made on the other branch first. This creates an instant mirror of your work, "
+"or\n"
+"facilitates lockstep development, where each developer is working together,\n"
+"continuously integrating the changes of others."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:19
+msgid ""
+"However the checkout is still a first class branch in Bazaar terms, so that\n"
+"you have the full history locally.  As you have a first class branch you "
+"can\n"
+"also commit locally if you want, for instance due to the temporary loss af "
+"a\n"
+"network connection. Use the --local option to commit to do this. All the "
+"local\n"
+"commits will then be made on the master branch the next time you do a non-"
+"local\n"
+"commit."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:26
+msgid ""
+"If you are using a checkout from a shared branch you will periodically want "
+"to\n"
+"pull in all the changes made by others. This is done using the \"update\"\n"
+"command. The changes need to be applied before any non-local commit, but\n"
+"Bazaar will tell you if there are any changes and suggest that you use this\n"
+"command when needed."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:32
+msgid ""
+"It is also possible to create a \"lightweight\" checkout by passing the\n"
+"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
+"SVN checkout in that it is not a first class branch, it mainly consists of "
+"the\n"
+"working tree. This means that any history operations must query the master\n"
+"branch, which could be slow if a network connection is involved. Also, as "
+"you\n"
+"don't have a local branch, then you cannot commit locally."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:39
+msgid ""
+"Lightweight checkouts work best when you have fast reliable access to the\n"
+"master branch. This means that if the master branch is on the same disk or "
+"LAN\n"
+"a lightweight checkout will be faster than a heavyweight one for any "
+"commands\n"
+"that modify the revision history (as only one copy of the branch needs to\n"
+"be updated). Heavyweight checkouts will generally be faster for any command\n"
+"that uses the history but does not change it, but if the master branch is "
+"on\n"
+"the same disk then there won't be a noticeable difference."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:47
+msgid ""
+"Another possible use for a checkout is to use it with a treeless repository\n"
+"containing your branches, where you maintain only one working tree by\n"
+"switching the master branch that the checkout points to when you want to\n"
+"work on a different branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:52
+msgid ""
+"Obviously to commit on a checkout you need to be able to write to the "
+"master\n"
+"branch. This means that the master branch must be accessible over a "
+"writeable\n"
+"protocol , such as sftp://, and that you have write permissions at the "
+"other\n"
+"end. Checkouts also work on the local file system, so that all that matters "
+"is\n"
+"file permissions."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:58
+msgid ""
+"You can change the master of a checkout by using the \"switch\" command "
+"(see\n"
+"\"help switch\").  This will change the location that the commits are sent "
+"to.\n"
+"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
+"checkout. If you would like to convert your heavy checkout into a normal\n"
+"branch so that every commit is local, you can use the \"unbind\" command. To "
+"see\n"
+"whether or not a branch is bound or not you can use the \"info\" command. If "
+"the\n"
+"branch is bound it will tell you the location of the bound branch."
+msgstr ""
+
+#: dummy/help_topics/checkouts/detail.txt:68
+msgid ""
+"  checkout    Create a checkout. Pass --lightweight to get a lightweight\n"
+"              checkout\n"
+"  update      Pull any changes in the master branch in to your checkout\n"
+"  commit      Make a commit that is sent to the master branch. If you have\n"
+"              a heavy checkout then the --local option will commit to the\n"
+"              checkout without sending the commit to the master\n"
+"  switch      Change the master branch that the commits in the checkout "
+"will\n"
+"              be sent to\n"
+"  bind        Turn a standalone branch into a heavy checkout so that any\n"
+"              commits will be sent to the master branch\n"
+"  unbind      Turn a heavy checkout into a standalone branch so that any\n"
+"              commits are only made locally\n"
+"  info        Displays whether a branch is bound or unbound. If the branch "
+"is\n"
+"              bound, then it will also display the location of the bound "
+"branch\n"
+msgstr ""
+
+#: dummy/help_topics/checkouts/summary.txt:1
+msgid "Information on what a checkout is"
+msgstr ""
+
+#: dummy/help_topics/commands/summary.txt:1
+msgid "Basic help for all commands"
+msgstr ""
+
+#: dummy/help_topics/configuration/summary.txt:1
+msgid "Details on the configuration settings available"
+msgstr ""
+
+#: dummy/help_topics/conflict-types/summary.txt:1
+msgid "Types of conflicts and what to do about them"
+msgstr ""
+
+#: dummy/help_topics/content-filters/summary.txt:1
+msgid "Conversion of content into/from working trees"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:1
+msgid "Criss-Cross"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:3
+msgid ""
+"A criss-cross in the branch history can cause the default merge technique\n"
+"to emit more conflicts than would normally be expected."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:6
+msgid ""
+"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
+"give\n"
+"better results.  You may wish to ``bzr revert`` the working tree and merge\n"
+"again.  Alternatively, use ``bzr remerge`` on particular conflicted files."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:10
+msgid ""
+"Criss-crosses occur in a branch's history if two branches merge the same "
+"thing\n"
+"and then merge one another, or if two branches merge one another at the "
+"same\n"
+"time.  They can be avoided by having each branch only merge from or into a\n"
+"designated central branch (a \"star topology\")."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:15
+msgid ""
+"Criss-crosses cause problems because of the way merge works.  Bazaar's "
+"default\n"
+"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
+"find a basis for comparison, BASE.  Using BASE, it can determine whether\n"
+"differences between THIS and OTHER are due to one side adding lines, or\n"
+"from another side removing lines."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:21
+msgid ""
+"Criss-crosses mean there is no good choice for a base.  Selecting the "
+"recent\n"
+"merge points could cause one side's changes to be silently discarded.\n"
+"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
+"are emitted."
+msgstr ""
+
+#: dummy/help_topics/criss-cross/detail.txt:26
+msgid ""
+"The ``weave`` merge type is not affected by this problem because it uses\n"
+"line-origin detection instead of a basis revision to determine the cause of\n"
+"differences.\n"
+msgstr ""
+
+#: dummy/help_topics/criss-cross/summary.txt:1
+msgid "Information on criss-cross merging"
+msgstr ""
+
+#: dummy/help_topics/current-formats/summary.txt:1
+msgid "Current storage formats"
+msgstr ""
+
+#: dummy/help_topics/debug-flags/summary.txt:1
+msgid "Options to show or record debug information"
+msgstr ""
+
+#: dummy/help_topics/diverged-branches/summary.txt:1
+msgid "How to fix diverged branches"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:1
+msgid "Environment Variables"
+msgstr ""
+
+#: dummy/help_topics/env-variables/detail.txt:3
+msgid ""
+"=================== "
+"===========================================================\n"
+"BZRPATH             Path where bzr is to look for shell plugin external\n"
+"                    commands.\n"
+"BZR_EMAIL           E-Mail address of the user. Overrides EMAIL.\n"
+"EMAIL               E-Mail address of the user.\n"
+"BZR_EDITOR          Editor for editing commit messages. Overrides EDITOR.\n"
+"EDITOR              Editor for editing commit messages.\n"
+"BZR_PLUGIN_PATH     Paths where bzr should look for plugins.\n"
+"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
+"BZR_PLUGINS_AT      Plugins to load from a directory not in "
+"BZR_PLUGIN_PATH.\n"
+"BZR_HOME            Directory holding .bazaar config dir. Overrides HOME.\n"
+"BZR_HOME (Win32)    Directory holding bazaar config dir. Overrides APPDATA "
+"and\n"
+"                    HOME.\n"
+"BZR_REMOTE_PATH     Full name of remote 'bzr' command (for bzr+ssh:// "
+"URLs).\n"
+"BZR_SSH             Path to SSH client, or one of paramiko, openssh, "
+"sshcorp,\n"
+"                    plink or lsh.\n"
+"BZR_LOG             Location of .bzr.log (use '/dev/null' to suppress log).\n"
+"BZR_LOG (Win32)     Location of .bzr.log (use 'NUL' to suppress log).\n"
+"BZR_COLUMNS         Override implicit terminal width.\n"
+"BZR_CONCURRENCY     Number of processes that can be run concurrently "
+"(selftest)\n"
+"BZR_PROGRESS_BAR    Override the progress display. Values are 'none' or "
+"'text'.\n"
+"BZR_PDB             Control whether to launch a debugger on error.\n"
+"BZR_SIGQUIT_PDB     Control whether SIGQUIT behaves normally or invokes a\n"
+"                    breakin debugger.\n"
+"BZR_TEXTUI_INPUT    Force console input mode for prompts to line-based "
+"(instead\n"
+"                    of char-based).\n"
+"=================== "
+"===========================================================\n"
+msgstr ""
+
+#: dummy/help_topics/env-variables/summary.txt:1
+msgid "Environment variable names and values"
+msgstr ""
+
+#: dummy/help_topics/eol/summary.txt:1
+msgid "Information on end-of-line handling"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:1
+msgid "Files"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:3
+msgid ""
+":On Unix:   ~/.bazaar/bazaar.conf\n"
+":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
+"bazaar\\\\2.0\\\\bazaar.conf"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:6
+msgid ""
+"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
+"used to define general configuration that will be applied everywhere.\n"
+"The section ``[ALIASES]`` can be used to create command aliases for\n"
+"commonly used options."
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:11
+msgid "A typical config file might look something like::"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:13
+msgid ""
+"  [DEFAULT]\n"
+"  email=John Doe <jdoe@isp.com>"
+msgstr ""
+
+#: dummy/help_topics/files/detail.txt:16
+msgid ""
+"  [ALIASES]\n"
+"  commit = commit --strict\n"
+"  log10 = log --short -r -10..-1\n"
+msgstr ""
+
+#: dummy/help_topics/files/summary.txt:1
+msgid "Information on configuration and log files"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:1
+msgid "Storage Formats"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:3
+msgid ""
+"To ensure that older clients do not access data incorrectly,\n"
+"Bazaar's policy is to introduce a new storage format whenever\n"
+"new features requiring new metadata are added. New storage\n"
+"formats may also be introduced to improve performance and\n"
+"scalability."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:9
+msgid ""
+"The newest format, 2a, is highly recommended. If your\n"
+"project is not using 2a, then you should suggest to the\n"
+"project owner to upgrade."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:13
+msgid ""
+"\n"
+".. note::"
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:16
+msgid ""
+"   Some of the older formats have two variants:\n"
+"   a plain one and a rich-root one. The latter include an additional\n"
+"   field about the root of the tree. There is no performance cost\n"
+"   for using a rich-root format but you cannot easily merge changes\n"
+"   from a rich-root format into a plain format. As a consequence,\n"
+"   moving a project to a rich-root format takes some co-ordination\n"
+"   in that all contributors need to upgrade their repositories\n"
+"   around the same time. 2a and all future formats will be\n"
+"   implicitly rich-root."
+msgstr ""
+
+#: dummy/help_topics/formats/detail.txt:26
+msgid ""
+"See :doc:`current-formats-help` for the complete list of\n"
+"currently supported formats. See :doc:`other-formats-help` for\n"
+"descriptions of any available experimental and deprecated formats.\n"
+msgstr ""
+
+#: dummy/help_topics/formats/summary.txt:1
+msgid "Information on choosing a storage format"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:1
+msgid "Global Options"
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:3
+msgid ""
+"These options may be used with any command, and may appear in front of any\n"
+"command.  (e.g. ``bzr --profile help``)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:6
+msgid ""
+"--version      Print the version number. Must be supplied before the "
+"command.\n"
+"--no-aliases   Do not process command aliases when running this command.\n"
+"--builtin      Use the built-in version of a command, not the plugin "
+"version.\n"
+"               This does not suppress other plugin effects.\n"
+"--no-plugins   Do not process any plugins.\n"
+"--no-l10n      Do not translate messages.\n"
+"--concurrency  Number of processes that can be run concurrently (selftest)."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:14
+msgid ""
+"--profile      Profile execution using the hotshot profiler.\n"
+"--lsprof       Profile execution using the lsprof profiler.\n"
+"--lsprof-file  Profile execution using the lsprof profiler, and write the\n"
+"               results to a specified file.  If the filename ends with "
+"\".txt\",\n"
+"               text format will be used.  If the filename either starts "
+"with\n"
+"               \"callgrind.out\" or end with \".callgrind\", the output will "
+"be\n"
+"               formatted for use with KCacheGrind. Otherwise, the output\n"
+"               will be a pickle.\n"
+"--coverage     Generate line coverage report in the specified directory."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:24
+msgid ""
+"-Oname=value   Override the ``name`` config option setting it to ``value`` "
+"for\n"
+"               the duration of the command.  This can be used multiple times "
+"if\n"
+"               several options need to be overridden."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:28
+msgid ""
+"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
+"information on profiling."
+msgstr ""
+
+#: dummy/help_topics/global-options/detail.txt:31
+msgid ""
+"A number of debug flags are also available to assist troubleshooting and\n"
+"development.  See :doc:`debug-flags-help`.\n"
+msgstr ""
+
+#: dummy/help_topics/global-options/summary.txt:1
+msgid "Options that control how Bazaar runs"
+msgstr ""
+
+#: dummy/help_topics/hidden-commands/summary.txt:1
+msgid "All hidden commands"
+msgstr ""
+
+#: dummy/help_topics/hooks/summary.txt:1
+msgid "Points at which custom processing can be added"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:1
+msgid "Integration with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:3
+msgid ""
+"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
+"specification tracking."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:6
+msgid ""
+"The bzr client (through the plugin called 'launchpad') has special\n"
+"features to communicate with Launchpad:"
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:9
+msgid ""
+"    * The launchpad-login command tells Bazaar your Launchpad user name. "
+"This\n"
+"      is then used by the 'lp:' transport to download your branches using\n"
+"      bzr+ssh://."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:13
+msgid ""
+"    * The 'lp:' transport uses Launchpad as a directory service: for "
+"example\n"
+"      'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
+"      projects and may be branched, logged, etc. You can also use the 'lp:'\n"
+"      transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:18
+msgid ""
+"    * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
+"      URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
+"lp:12345'\n"
+"      will record a revision property that marks that revision as fixing\n"
+"      Launchpad bug 12345. When you push that branch to Launchpad it will\n"
+"      automatically be linked to the bug report."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:24
+msgid ""
+"    * The register-branch command tells Launchpad about the url of a\n"
+"      public branch.  Launchpad will then mirror the branch, display\n"
+"      its contents and allow it to be attached to bugs and other\n"
+"      objects."
+msgstr ""
+
+#: dummy/help_topics/launchpad/detail.txt:29
+msgid "For more information see http://help.launchpad.net/\n"
+msgstr ""
+
+#: dummy/help_topics/launchpad/summary.txt:1
+msgid "Using Bazaar with Launchpad.net"
+msgstr ""
+
+#: dummy/help_topics/location-alias/summary.txt:1
+msgid "Aliases for remembered locations"
+msgstr ""
+
+#: dummy/help_topics/log-formats/summary.txt:1
+msgid "Details on the logging formats available"
+msgstr ""
+
+#: dummy/help_topics/other-formats/summary.txt:1
+msgid "Experimental and deprecated storage formats"
+msgstr ""
+
+#: dummy/help_topics/patterns/summary.txt:1
+msgid "Information on the pattern syntax"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:1
+msgid "Repositories"
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:3
+msgid ""
+"Repositories in Bazaar are where committed information is stored. There is\n"
+"a repository associated with every branch."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:6
+msgid ""
+"Repositories are a form of database. Bzr will usually maintain this for\n"
+"good performance automatically, but in some situations (e.g. when doing\n"
+"very many commits in a short time period) you may want to ask bzr to\n"
+"optimise the database indices. This can be done by the 'bzr pack' command."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:11
+msgid ""
+"By default just running 'bzr init' will create a repository within the new\n"
+"branch but it is possible to create a shared repository which allows "
+"multiple\n"
+"branches to share their information in the same location. When a new branch "
+"is\n"
+"created it will first look to see if there is a containing shared repository "
+"it\n"
+"can use."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:17
+msgid ""
+"When two branches of the same project share a repository, there is\n"
+"generally a large space saving. For some operations (e.g. branching\n"
+"within the repository) this translates in to a large time saving."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:21
+msgid ""
+"To create a shared repository use the init-repository command (or the alias\n"
+"init-repo). This command takes the location of the repository to create. "
+"This\n"
+"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
+"which contains a shared repository. Any new branches that are created in "
+"this\n"
+"directory will then use it for storage."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:27
+msgid ""
+"It is a good idea to create a repository whenever you might create more\n"
+"than one branch of a project. This is true for both working areas where you\n"
+"are doing the development, and any server areas that you use for hosting\n"
+"projects. In the latter case, it is common to want branches without working\n"
+"trees. Since the files in the branch will not be edited directly there is "
+"no\n"
+"need to use up disk space for a working tree. To create a repository in "
+"which\n"
+"the branches will not have working trees pass the '--no-trees' option to\n"
+"'init-repository'."
+msgstr ""
+
+#: dummy/help_topics/repositories/detail.txt:38
+msgid ""
+"  init-repository   Create a shared repository. Use --no-trees to create "
+"one\n"
+"                    in which new branches won't get a working tree.\n"
+msgstr ""
+
+#: dummy/help_topics/repositories/summary.txt:1
+msgid "Basic information on shared repositories."
+msgstr ""
+
+#: dummy/help_topics/revisionspec/summary.txt:1
+msgid "Explain how to use --revision"
+msgstr ""
+
+#: dummy/help_topics/rules/summary.txt:1
+msgid "Information on defining rule-based preferences"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:1
+msgid "Standalone Trees"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:3
+msgid ""
+"A standalone tree is a working tree with an associated repository. It\n"
+"is an independently usable branch, with no dependencies on any other.\n"
+"Creating a standalone tree (via bzr init) is the quickest way to put\n"
+"an existing project under version control."
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:8
+msgid "Related Commands::"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/detail.txt:10
+msgid "  init    Make a directory into a versioned branch.\n"
+msgstr ""
+
+#: dummy/help_topics/standalone-trees/summary.txt:1
+msgid "Information on what a standalone tree is"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:1
+msgid "Standard Options"
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:3
+msgid "Standard options are legal for all commands."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:5
+msgid ""
+"--help, -h     Show help message.\n"
+"--verbose, -v  Display more information.\n"
+"--quiet, -q    Only display errors and warnings."
+msgstr ""
+
+#: dummy/help_topics/standard-options/detail.txt:9
+msgid "Unlike global options, standard options can be used in aliases.\n"
+msgstr ""
+
+#: dummy/help_topics/standard-options/summary.txt:1
+msgid "Options that can be used with any command"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:1
+msgid "Status Flags"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:3
+msgid ""
+"Status flags are used to summarise changes to the working tree in a concise\n"
+"manner.  They are in the form::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:6
+msgid "   xxx   <filename>"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:8
+msgid "where the columns' meanings are as follows."
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:10
+msgid "Column 1 - versioning/renames::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:12
+msgid ""
+"  + File versioned\n"
+"  - File unversioned\n"
+"  R File renamed\n"
+"  ? File unknown\n"
+"  X File nonexistent (and unknown to bzr)\n"
+"  C File has conflicts\n"
+"  P Entry for a pending merge (not a file)"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:20
+msgid "Column 2 - contents::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:22
+msgid ""
+"  N File created\n"
+"  D File deleted\n"
+"  K File kind changed\n"
+"  M File modified"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:27
+msgid "Column 3 - execute::"
+msgstr ""
+
+#: dummy/help_topics/status-flags/detail.txt:29
+msgid "  * The execute bit was changed\n"
+msgstr ""
+
+#: dummy/help_topics/status-flags/summary.txt:1
+msgid "Help on status flags"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
+msgid "Branches Out of Sync"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
+msgid ""
+"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
+"a local branch must be destroyed.  (For checkouts, this is the local branch\n"
+"that serves primarily as a cache.)  If the branch-to-be-destroyed does not\n"
+"have the same last revision as the new reference branch for the lightweight\n"
+"checkout, data could be lost, so Bazaar refuses."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
+msgid "How you deal with this depends on *why* the branches are out of sync."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
+msgid ""
+"If you have a checkout and have done local commits, you can get back in "
+"sync\n"
+"by running \"bzr update\" (and possibly \"bzr commit\")."
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
+msgid ""
+"If you have a branch and the remote branch is out-of-date, you can push\n"
+"the local changes using \"bzr push\".  If the local branch is out of date, "
+"you\n"
+"can do \"bzr pull\".  If both branches have had changes, you can merge, "
+"commit\n"
+"and then push your changes.  If you decide that some of the changes aren't\n"
+"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
+msgstr ""
+
+#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
+msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
+msgstr ""
+
+#: dummy/help_topics/topics/summary.txt:1
+msgid "Topics list"
+msgstr ""
+
+#: dummy/help_topics/url-special-chars/summary.txt:1
+msgid "Special character handling in URLs"
+msgstr ""
+
+#: dummy/help_topics/urlspec/summary.txt:1
+msgid "Supported transport protocols"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:1
+msgid "Working Trees"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:3
+msgid ""
+"A working tree is the contents of a branch placed on disk so that you can\n"
+"see the files and edit them. The working tree is where you make changes to "
+"a\n"
+"branch, and when you commit the current state of the working tree is the\n"
+"snapshot that is recorded in the commit."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:8
+msgid ""
+"When you push a branch to a remote system, a working tree will not be\n"
+"created. If one is already present the files will not be updated. The\n"
+"branch information will be updated and the working tree will be marked\n"
+"as out-of-date. Updating a working tree remotely is difficult, as there\n"
+"may be uncommitted changes or the update may cause content conflicts that "
+"are\n"
+"difficult to deal with remotely."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:15
+msgid ""
+"If you have a branch with no working tree you can use the 'checkout' "
+"command\n"
+"to create a working tree. If you run 'bzr checkout .' from the branch it "
+"will\n"
+"create the working tree. If the branch is updated remotely, you can update "
+"the\n"
+"working tree by running 'bzr update' in that directory."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:20
+msgid ""
+"If you have a branch with a working tree that you do not want the 'remove-"
+"tree'\n"
+"command will remove the tree if it is safe. This can be done to avoid the\n"
+"warning about the remote working tree not being updated when pushing to the\n"
+"branch. It can also be useful when working with a '--no-trees' repository\n"
+"(see 'bzr help repositories')."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:26
+msgid ""
+"If you want to have a working tree on a remote machine that you push to you\n"
+"can either run 'bzr update' in the remote branch after each push, or use "
+"some\n"
+"other method to update the tree during the push. There is an 'rspush' "
+"plugin\n"
+"that will update the working tree using rsync as well as doing a push. "
+"There\n"
+"is also a 'push-and-update' plugin that automates running 'bzr update' via "
+"SSH\n"
+"after each push."
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:33
+msgid "Useful commands::"
+msgstr ""
+
+#: dummy/help_topics/working-trees/detail.txt:35
+msgid ""
+"  checkout     Create a working tree when a branch does not have one.\n"
+"  remove-tree  Removes the working tree from a branch when it is safe to do "
+"so.\n"
+"  update       When a working tree is out of sync with its associated "
+"branch\n"
+"               this will update the tree to match the branch.\n"
+msgstr ""
+
+#: dummy/help_topics/working-trees/summary.txt:1
+msgid "Information on working trees"
+msgstr ""
+
+#: en/help_topics/authentication.txt:1
+msgid ""
+"Authentication Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/authentication.txt:4
+msgid ""
+"\n"
+"Intent\n"
+"------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:8
+msgid ""
+"Many different authentication policies can be described in the\n"
+"``authentication.conf`` file but a particular user should need only a few\n"
+"definitions to cover his needs without having to specify a user and a "
+"password\n"
+"for every branch he uses."
+msgstr ""
+
+#: en/help_topics/authentication.txt:13
+msgid ""
+"The definitions found in this file are used to find the credentials to use "
+"for\n"
+"a given url. The same credentials can generally be used for as many branches "
+"as\n"
+"possible by grouping their declaration around the remote servers that need\n"
+"them. It's even possible to declare credentials that will be used by "
+"different\n"
+"servers."
+msgstr ""
+
+#: en/help_topics/authentication.txt:19
+msgid ""
+"The intent is to make this file as small as possible to minimize maintenance."
+msgstr ""
+
+#: en/help_topics/authentication.txt:21
+msgid ""
+"Once the relevant credentials are declared in this file you may use branch "
+"urls\n"
+"without embedding passwords (security hazard) or even users (enabling "
+"sharing\n"
+"of your urls with others)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:25
+msgid "Instead of using::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:27
+msgid "  bzr branch ftp://joe:secret@host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:29
+msgid "you simply use::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:31
+msgid "  bzr branch ftp://host.com/path/to/my/branch"
+msgstr ""
+
+#: en/help_topics/authentication.txt:33
+msgid ""
+"provided you have created the following ``authentication.conf`` file::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:35
+msgid ""
+"  [myprojects]\n"
+"  scheme=ftp\n"
+"  host=host.com\n"
+"  user=joe\n"
+"  password=secret\n"
+"  "
+msgstr ""
+
+#: en/help_topics/authentication.txt:42
+msgid ""
+"Authentication definitions\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:45
+msgid ""
+"There are two kinds of authentication used by the various schemes supported "
+"by\n"
+"bzr:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:48
+msgid "1. user and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:50
+msgid ""
+"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
+"``SFTP`` can use either a password or a host key to authenticate. However,\n"
+"ssh agents are a better, more secure solution. So we have chosen to not "
+"provide\n"
+"our own less secure method."
+msgstr ""
+
+#: en/help_topics/authentication.txt:55
+msgid "2. user, realm and password"
+msgstr ""
+
+#: en/help_topics/authentication.txt:57
+msgid ""
+"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
+"against a host. But, by using ``.htaccess`` files, for example, it is "
+"possible\n"
+"to define several (``user, realm, password``) for a given ``host``. So what "
+"is\n"
+"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
+"is\n"
+"not taken into account in the definitions, but will displayed if bzr "
+"prompts\n"
+"you for a password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:64
+msgid ""
+"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
+"specifying the appropriate port."
+msgstr ""
+
+#: en/help_topics/authentication.txt:67
+msgid ""
+"To take all schemes into account, the password will be deduced from a set "
+"of\n"
+"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
+"``user``,\n"
+"``password``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:71
+msgid ""
+"  * ``scheme``: can be empty (meaning the rest of the definition can be "
+"used\n"
+"    for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
+"``ssh``\n"
+"    should be used instead since this is the real scheme regarding\n"
+"    authentication,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:76
+msgid "  * ``host``: can be empty (to act as a default for any host),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:78
+msgid ""
+"  * ``port`` can be empty (useful when an host provides several servers for "
+"the\n"
+"    same scheme), only numerical values are allowed, this should be used "
+"only\n"
+"    when the server uses a port different than the scheme standard port,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:82
+msgid "  * ``path``: can be empty (FTP or SFTP will never user it),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:84
+msgid ""
+"  * ``user``: can be empty (``bzr`` will defaults to python's\n"
+"    ``getpass.get_user()``),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:87
+msgid ""
+"  * ``password``: can be empty if you prefer to always be prompted for your\n"
+"    password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:90
+msgid ""
+"Multiple definitions can be provided and, for a given URL, bzr will select "
+"a\n"
+"(``user`` [, ``password``]) based on the following rules :"
+msgstr ""
+
+#: en/help_topics/authentication.txt:93
+msgid " 1. the first match wins,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:95
+msgid " 2. empty fields match everything,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:97
+msgid ""
+" 3. ``scheme`` matches even if decorators are used in the requested URL,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:99
+msgid ""
+" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
+"    (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
+"``projectbzr.sf.net``\n"
+"    will not match ``bzr.sf.net``)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:103
+msgid ""
+" 5. ``port`` matches if included in the requested URL (exact matches only)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:105
+msgid ""
+" 6. ``path`` matches if included in the requested URL (and by rule #2 "
+"above,\n"
+"    empty paths will match any provided path)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:110
+msgid ""
+"File format\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:113
+msgid ""
+"The general rules for :doc:`configuration files <configuration-help>`\n"
+"apply except for the variable policies."
+msgstr ""
+
+#: en/help_topics/authentication.txt:116
+msgid "Each section describes an authentication definition."
+msgstr ""
+
+#: en/help_topics/authentication.txt:118
+msgid ""
+"The section name is an arbitrary string, only the ``DEFAULT`` value is "
+"reserved\n"
+"and should appear as the *last* section."
+msgstr ""
+
+#: en/help_topics/authentication.txt:121
+msgid "Each section should define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:123
+msgid "* ``user``: the login to be used,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:125
+msgid "Each section could define:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:127
+msgid "* ``host``: the remote server,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:129
+msgid "* ``port``: the port the server is listening,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:131
+msgid "* ``path``: the branch location,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:133
+msgid "* ``password``: the password."
+msgstr ""
+
+#: en/help_topics/authentication.txt:135
+msgid ""
+"\n"
+"Examples\n"
+"--------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:139
+msgid ""
+"\n"
+"Personal projects hosted outside\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:143
+msgid ""
+"All connections are done with the same ``user`` (the remote one for which "
+"the\n"
+"default bzr one is not appropriate) and the password is always prompted "
+"with\n"
+"some exceptions::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:147
+msgid ""
+"        # Pet projects on hobby.net\n"
+"        [hobby]\n"
+"        host=r.hobby.net\n"
+"        user=jim\n"
+"        password=obvious1234\n"
+"        \n"
+"        # Home server\n"
+"        [home]\n"
+"        scheme=https\n"
+"        host=home.net\n"
+"        user=joe\n"
+"        password=1essobV10us\n"
+"        \n"
+"        [DEFAULT]\n"
+"        # Our local user is barbaz, on all remote sites we're known as "
+"foobar\n"
+"        user=foobar"
+msgstr ""
+
+#: en/help_topics/authentication.txt:164
+msgid ""
+"\n"
+"Source hosting provider\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:168
+msgid "In the shp.net (fictitious) domain, each project has its own site::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:170
+msgid ""
+"        [shpnet domain]\n"
+"        # we use sftp, but ssh is the scheme used for authentication\n"
+"        scheme=ssh\n"
+"        # The leading '.' ensures that 'shp.net' alone doesn't match\n"
+"        host=.shp.net\n"
+"        user=joe\n"
+"        # bzr don't support supplying a password for sftp,\n"
+"        # consider using an ssh agent if you don't want to supply\n"
+"        # a password interactively. (pageant, ssh-agent, etc)"
+msgstr ""
+
+#: en/help_topics/authentication.txt:180
+msgid ""
+"HTTPS, SFTP servers and their proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/authentication.txt:183
+msgid ""
+"At company.com, the server hosting release and integration branches is "
+"behind a\n"
+"proxy, and the two branches use different authentication policies::"
+msgstr ""
+
+#: en/help_topics/authentication.txt:186
+msgid ""
+"        [reference code]\n"
+"        scheme=https\n"
+"        host=dev.company.com\n"
+"        path=/dev\n"
+"        user=user1\n"
+"        password=pass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:193
+msgid ""
+"        # development branches on dev server\n"
+"        [dev]\n"
+"        scheme=ssh # bzr+ssh and sftp are available here\n"
+"        host=dev.company.com\n"
+"        path=/dev/integration\n"
+"        user=user2\n"
+"        \n"
+"        # proxy\n"
+"        [proxy]\n"
+"        scheme=http\n"
+"        host=proxy.company.com\n"
+"        port=3128\n"
+"        user=proxyuser1\n"
+"        password=proxypass1"
+msgstr ""
+
+#: en/help_topics/authentication.txt:208
+msgid ""
+"\n"
+"Planned enhancements\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/authentication.txt:212
+msgid ""
+"The following are not yet implemented but planned as parts of a work in\n"
+"progress:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:215
+msgid "* add a  ``password_encoding`` field allowing:"
+msgstr ""
+
+#: en/help_topics/authentication.txt:217
+msgid ""
+"  - storing the passwords in various obfuscating encodings (base64 for one),"
+msgstr ""
+
+#: en/help_topics/authentication.txt:219
+msgid "  - delegate password storage to plugins (.netrc for example)."
+msgstr ""
+
+#: en/help_topics/authentication.txt:221
+msgid ""
+"* update the credentials when the user is prompted for user or password,"
+msgstr ""
+
+#: en/help_topics/authentication.txt:223
+msgid "* add a ``verify_certificates`` field for ``HTTPS``."
+msgstr ""
+
+#: en/help_topics/authentication.txt:225
+msgid ""
+"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
+"but\n"
+"ignored in the actual implementation.\n"
+msgstr ""
+
+#: en/help_topics/bugs.txt:1
+msgid "Bug Tracker Settings"
+msgstr ""
+
+#: en/help_topics/bugs.txt:3
+msgid ""
+"When making a commit, metadata about bugs fixed by that change can be\n"
+"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
+"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
+"(The only ``status`` value currently supported is ``fixed.``)"
+msgstr ""
+
+#: en/help_topics/bugs.txt:8
+msgid ""
+"The ``--fixes`` option allows you to specify a bug tracker and a bug "
+"identifier\n"
+"rather than a full URL. This looks like::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:11
+msgid "    bzr commit --fixes <tracker>:<id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
+msgid "or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:15
+msgid "    bzr commit --fixes <id>"
+msgstr ""
+
+#: en/help_topics/bugs.txt:17
+msgid ""
+"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
+"the\n"
+"identifier for that bug within the bugtracker, usually the bug number.\n"
+"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
+"or global configuration is used."
+msgstr ""
+
+#: en/help_topics/bugs.txt:22
+msgid ""
+"Bazaar knows about a few bug trackers that have many users. If\n"
+"you use one of these bug trackers then there is no setup required to\n"
+"use this feature, you just need to know the tracker identifier to use.\n"
+"These are the bugtrackers that are built in:"
+msgstr ""
+
+#: en/help_topics/bugs.txt:27
+msgid ""
+"  ============================ ============ ============\n"
+"  URL                          Abbreviation Example\n"
+"  ============================ ============ ============\n"
+"  https://bugs.launchpad.net/  lp           lp:12345\n"
+"  http://bugs.debian.org/      deb          deb:12345\n"
+"  http://bugzilla.gnome.org/   gnome        gnome:12345\n"
+"  ============================ ============ ============"
+msgstr ""
+
+#: en/help_topics/bugs.txt:35
+msgid ""
+"For the bug trackers not listed above configuration is required.\n"
+"Support for generating the URLs for any project using Bugzilla or Trac\n"
+"is built in, along with a template mechanism for other bugtrackers with\n"
+"simple URL schemes. If your bug tracker can't be described by one\n"
+"of the schemes described below then you can write a plugin to support\n"
+"it."
+msgstr ""
+
+#: en/help_topics/bugs.txt:42
+msgid ""
+"If you use Bugzilla or Trac, then you only need to set a configuration\n"
+"variable which contains the base URL of the bug tracker. These options\n"
+"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
+"configuration section in ``locations.conf``.  You can set up these values\n"
+"for each of the projects you work on."
+msgstr ""
+
+#: en/help_topics/bugs.txt:48
+msgid ""
+"Note: As you provide a short name for each tracker, you can specify one or\n"
+"more bugs in one or more trackers at commit time if you wish."
+msgstr ""
+
+#: en/help_topics/bugs.txt:51
+msgid ""
+"Launchpad\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:54
+msgid ""
+"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
+msgstr ""
+
+#: en/help_topics/bugs.txt:56
+msgid ""
+"bugzilla_<tracker>_url\n"
+"----------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:59
+msgid ""
+"If present, the location of the Bugzilla bug tracker referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:64
+msgid "    bugzilla_squid_url = http://bugs.squid-cache.org"
+msgstr ""
+
+#: en/help_topics/bugs.txt:66
+msgid ""
+"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:69
+msgid ""
+"trac_<tracker>_url\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:72
+msgid ""
+"If present, the location of the Trac instance referred to by\n"
+"<tracker>. This option can then be used together with ``bzr commit\n"
+"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
+"example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:77
+msgid "    trac_twisted_url = http://www.twistedmatrix.com/trac"
+msgstr ""
+
+#: en/help_topics/bugs.txt:79
+msgid ""
+"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
+"as\n"
+"fixed."
+msgstr ""
+
+#: en/help_topics/bugs.txt:82
+msgid ""
+"bugtracker_<tracker>_url\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/bugs.txt:85
+msgid ""
+"If present, the location of a generic bug tracker instance referred to by\n"
+"<tracker>. The location must contain an ``{id}`` placeholder,\n"
+"which will be replaced by a specific bug ID. This option can then be used\n"
+"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
+"fixed by that commit. For example::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:91
+msgid "    bugtracker_python_url = http://bugs.python.org/issue{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:93
+msgid ""
+"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
+"Roundup bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:96
+msgid ""
+"    bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:98
+msgid ""
+"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
+"RT bug tracker as fixed, or::"
+msgstr ""
+
+#: en/help_topics/bugs.txt:101
+msgid "    bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
+msgstr ""
+
+#: en/help_topics/bugs.txt:103
+msgid ""
+"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
+"1234\n"
+"in Hudson's JIRA bug tracker as fixed.\n"
+msgstr ""
+
+#: en/help_topics/commands.txt:1
+msgid ""
+"add               Add specified files or directories.\n"
+"alias             Set/unset and display aliases.\n"
+"annotate          Show the origin of each line in a file.\n"
+"bash-completion   Generate a shell function for bash command line "
+"completion.\n"
+"                  [bash_completion]\n"
+"bind              Convert the current branch into a checkout of the "
+"supplied\n"
+"                  branch.\n"
+"branch            Create a new branch that is a copy of an existing branch.\n"
+"branches          List the branches available at the current location.\n"
+"break-lock        Break a dead lock.\n"
+"cat               Write the contents of a file as of a given revision to\n"
+"                  standard output.\n"
+"check             Validate working tree structure, branch consistency and\n"
+"                  repository history.\n"
+"checkout          Create a new checkout of an existing branch.\n"
+"clean-tree        Remove unwanted files from working tree.\n"
+"commit            Commit changes into a new revision.\n"
+"config            Display, set or remove a configuration option.\n"
+"conflicts         List files with conflicts.\n"
+"deleted           List files deleted in the working tree.\n"
+"diff              Show differences in the working tree, between revisions "
+"or\n"
+"                  branches.\n"
+"dpush             Push into a different VCS without any custom bzr "
+"metadata.\n"
+"export            Export current or past revision to a destination directory "
+"or\n"
+"                  archive.\n"
+"help              Show help on a command or other topic.\n"
+"ignore            Ignore specified files or patterns.\n"
+"ignored           List ignored files and the patterns that matched them.\n"
+"info              Show information about a working tree, branch or "
+"repository.\n"
+"init              Make a directory into a versioned branch.\n"
+"init-repository   Create a shared repository for branches to share storage\n"
+"                  space.\n"
+"join              Combine a tree into its containing tree.\n"
+"launchpad-login   Show or set the Launchpad user ID. [launchpad]\n"
+"launchpad-mirror  Ask Launchpad to mirror a branch now. [launchpad]\n"
+"launchpad-open    Open a Launchpad branch page in your web browser. "
+"[launchpad]\n"
+"log               Show historical log for a branch or subset of a branch.\n"
+"lp-find-proposal  Find the proposal to merge this revision. [launchpad]\n"
+"lp-propose-merge  Propose merging a branch on Launchpad. [launchpad]\n"
+"ls                List files in a tree.\n"
+"merge             Perform a three-way merge.\n"
+"missing           Show unmerged/unpulled revisions between two branches.\n"
+"mkdir             Create a new versioned directory.\n"
+"mv                Move or rename a file.\n"
+"nick              Print or set the branch nickname.\n"
+"pack              Compress the data within a repository.\n"
+"plugins           List the installed plugins.\n"
+"pull              Turn this branch into a mirror of another branch.\n"
+"push              Update a mirror of this branch.\n"
+"reconcile         Reconcile bzr metadata in a branch.\n"
+"reconfigure       Reconfigure the type of a bzr directory.\n"
+"register-branch   Register a branch with launchpad.net. [launchpad]\n"
+"remerge           Redo a merge.\n"
+"remove            Remove files or directories.\n"
+"remove-branch     Remove a branch.\n"
+"remove-tree       Remove the working tree from a given branch/checkout.\n"
+"renames           Show list of renamed files.\n"
+"resolve           Mark a conflict as resolved.\n"
+"revert            Revert files to a previous revision.\n"
+"revno             Show current revision number.\n"
+"root              Show the tree root directory.\n"
+"send              Mail or create a merge-directive for submitting changes.\n"
+"serve             Run the bzr server.\n"
+"shelve            Temporarily set aside some changes from the current tree.\n"
+"sign-my-commits   Sign all commits by a given committer.\n"
+"split             Split a subdirectory of a tree into a separate tree.\n"
+"status            Display status summary.\n"
+"switch            Set the branch of a checkout and update.\n"
+"tag               Create, remove or modify a tag naming a revision.\n"
+"tags              List tags.\n"
+"testament         Show testament (signing-form) of a revision.\n"
+"unbind            Convert the current checkout into a regular branch.\n"
+"uncommit          Remove the last committed revision.\n"
+"unshelve          Restore shelved changes.\n"
+"update            Update a working tree to a new revision.\n"
+"upgrade           Upgrade a repository, branch or working tree to a newer\n"
+"                  format.\n"
+"verify-signatures Verify all commit signatures.\n"
+"version           Show version of bzr.\n"
+"version-info      Show version information about this tree.\n"
+"view              Manage filtered views.\n"
+"whoami            Show or set bzr user id.\n"
+msgstr ""
+
+#: en/help_topics/configuration.txt:1
+msgid ""
+"Configuration Settings\n"
+"======================="
+msgstr ""
+
+#: en/help_topics/configuration.txt:4
+msgid ""
+"Environment settings\n"
+"---------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:7
+msgid ""
+"While most configuration is handled by configuration files, some options\n"
+"which may be semi-permanent can also be controlled through the environment."
+msgstr ""
+
+#: en/help_topics/configuration.txt:10
+msgid ""
+"BZR_EMAIL\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:13
+msgid "Override the email id used by Bazaar.  Typical format::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:15
+msgid "  \"John Doe <jdoe@example.com>\""
+msgstr ""
+
+#: en/help_topics/configuration.txt:17
+msgid "See also the ``email`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:19
+msgid ""
+"BZR_PROGRESS_BAR\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:22
+msgid ""
+"Override the progress display.  Possible values are \"none\" or \"text\".  "
+"If\n"
+"the value is \"none\" then no progress bar is displayed.  The value \"text\" "
+"draws\n"
+"the ordinary command line progress bar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:26
+msgid ""
+"BZR_SIGQUIT_PDB\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:29
+msgid ""
+"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
+msgstr ""
+
+#: en/help_topics/configuration.txt:31
+msgid ""
+"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
+"* 1 = Invoke breakin debugger (default)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:34
+msgid ""
+"BZR_HOME\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:37
+msgid "Override the home directory used by Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:39
+msgid ""
+"BZR_SSH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:42
+msgid "Select a different SSH implementation."
+msgstr ""
+
+#: en/help_topics/configuration.txt:44
+msgid ""
+"BZR_PDB\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:47
+msgid "Control whether to launch a debugger on error."
+msgstr ""
+
+#: en/help_topics/configuration.txt:49
+msgid ""
+"* 0 = Standard behavior\n"
+"* 1 = Launch debugger"
+msgstr ""
+
+#: en/help_topics/configuration.txt:52
+msgid ""
+"BZR_REMOTE_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:55
+msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
+msgstr ""
+
+#: en/help_topics/configuration.txt:57
+msgid "See also the ``bzr_remote_path`` configuration option."
+msgstr ""
+
+#: en/help_topics/configuration.txt:59
+msgid ""
+"BZR_EDITOR\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:62
+msgid "Path to the editor Bazaar should use for commit messages, etc."
+msgstr ""
+
+#: en/help_topics/configuration.txt:64
+msgid ""
+"BZR_LOG\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:67
+msgid ""
+"Location of the Bazaar log file. You can check the current location by\n"
+"running ``bzr version``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:70
+msgid ""
+"The log file contains debug information that is useful for diagnosing or\n"
+"reporting problems with Bazaar."
+msgstr ""
+
+#: en/help_topics/configuration.txt:73
+msgid ""
+"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
+"will disable logging."
+msgstr ""
+
+#: en/help_topics/configuration.txt:76
+msgid ""
+"\n"
+"BZR_PLUGIN_PATH\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:80
+msgid ""
+"The path to the plugins directory that Bazaar should use.\n"
+"If not set, Bazaar will search for plugins in:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:83
+msgid ""
+"* the user specific plugin directory (containing the ``user`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:85
+msgid "* the bzrlib directory (containing the ``core`` plugins),"
+msgstr ""
+
+#: en/help_topics/configuration.txt:87
+msgid ""
+"* the site specific plugin directory if applicable (containing\n"
+"  the ``site`` plugins)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:90
+msgid ""
+"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
+"the way the plugin are searched. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:93
+msgid ""
+"As for the ``PATH`` variables, if multiple directories are\n"
+"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
+"platform specific appropriate character (':' on Unix,\n"
+"';' on windows)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:98
+msgid ""
+"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
+"in ``user``.  However it will continue to search in ``core`` and\n"
+"``site`` unless they are explicitly removed."
+msgstr ""
+
+#: en/help_topics/configuration.txt:102
+msgid ""
+"If you need to change the order or remove one of these\n"
+"directories, you should use special values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:105
+msgid ""
+"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
+"  path from the default values,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:108
+msgid ""
+"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
+"  before the remaining default values (and also remove it from\n"
+"  the default values)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:112
+msgid ""
+"Note that the special values 'user', 'core' and 'site' should be\n"
+"used literally, they will be substituted by the corresponding,\n"
+"platform specific, values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:116
+msgid ""
+"The examples below use ':' as the separator, windows users\n"
+"should use ';'."
+msgstr ""
+
+#: en/help_topics/configuration.txt:119
+msgid "Overriding the default user plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:121
+msgid "  BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:123
+msgid "Disabling the site directory while retaining the user directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:125
+msgid "  BZR_PLUGIN_PATH='-site:+user'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:127
+msgid "Disabling all plugins (better achieved with --no-plugins)::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:129
+msgid "  BZR_PLUGIN_PATH='-user:-core:-site'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:131
+msgid "Overriding the default site plugin directory::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:133
+msgid "  BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
+msgstr ""
+
+#: en/help_topics/configuration.txt:135
+msgid ""
+"BZR_DISABLE_PLUGINS\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:138
+msgid ""
+"Under special circumstances (mostly when trying to diagnose a\n"
+"bug), it's better to disable a plugin (or several) rather than\n"
+"uninstalling them completely. Such plugins can be specified in\n"
+"the ``BZR_DISABLE_PLUGINS`` environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:143
+msgid ""
+"In that case, ``bzr`` will stop loading the specified plugins and\n"
+"will raise an import error if they are explicitly imported (by\n"
+"another plugin that depends on them for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:147
+msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:149
+msgid "  BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
+msgstr ""
+
+#: en/help_topics/configuration.txt:151
+msgid ""
+"BZR_PLUGINS_AT\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:154
+msgid ""
+"When adding a new feature or working on a bug in a plugin,\n"
+"developers often need to use a specific version of a given\n"
+"plugin. Since python requires that the directory containing the\n"
+"code is named like the plugin itself this make it impossible to\n"
+"use arbitrary directory names (using a two-level directory scheme\n"
+"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
+"if they don't appear in ``BZR_PLUGIN_PATH`` ."
+msgstr ""
+
+#: en/help_topics/configuration.txt:162
+msgid ""
+"Plugins specified in this environment variable takes precedence\n"
+"over the ones in ``BZR_PLUGIN_PATH``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:165
+msgid ""
+"The variable specified a list of ``plugin_name@plugin path``,\n"
+"``plugin_name`` being the name of the plugin as it appears in\n"
+"python module paths, ``plugin_path`` being the path to the\n"
+"directory containing the plugin code itself\n"
+"(i.e. ``plugins/myplugin`` not ``plugins``).  Use ':' as the list\n"
+"separator, use ';' on windows."
+msgstr ""
+
+#: en/help_topics/configuration.txt:172
+msgid ""
+"Example:\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:175
+msgid ""
+"Using a specific version of ``myplugin``:\n"
+"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
+msgstr ""
+
+#: en/help_topics/configuration.txt:178
+msgid ""
+"BZRPATH\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:181
+msgid "The path where Bazaar should look for shell plugin external commands."
+msgstr ""
+
+#: en/help_topics/configuration.txt:183
+msgid ""
+"\n"
+"http_proxy, https_proxy\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:187
+msgid "Specifies the network proxy for outgoing connections, for example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:189
+msgid ""
+"  http_proxy=http://proxy.example.com:3128/ \n"
+"  https_proxy=http://proxy.example.com:3128/"
+msgstr ""
+
+#: en/help_topics/configuration.txt:192
+msgid ""
+"\n"
+"Configuration files\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:196
+msgid ""
+"Location\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:199
+msgid ""
+"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
+"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
+"on\n"
+"Windows. (You can check the location for your system by using\n"
+"``bzr version``.)"
+msgstr ""
+
+#: en/help_topics/configuration.txt:204
+msgid "There are three primary configuration files in this location:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:206
+msgid "* ``bazaar.conf`` describes default configuration options,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:208
+msgid ""
+"* ``locations.conf`` describes configuration information for\n"
+"  specific branch locations,"
+msgstr ""
+
+#: en/help_topics/configuration.txt:211
+msgid ""
+"* ``authentication.conf`` describes credential information for\n"
+"  remote servers."
+msgstr ""
+
+#: en/help_topics/configuration.txt:214
+msgid ""
+"Each branch can also contain a configuration file that sets values specific\n"
+"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
+"the\n"
+"branch. This file is visible to all users of a branch, if you wish to "
+"override\n"
+"one of the values for a branch with a setting that is specific to you then "
+"you\n"
+"can do so in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:220
+msgid ""
+"General format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:223
+msgid ""
+"An ini file has three types of contructs: section headers, section\n"
+"options and comments."
+msgstr ""
+
+#: en/help_topics/configuration.txt:226
+msgid ""
+"Comments\n"
+"^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:229
+msgid ""
+"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
+"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
+"Bazaar when parsing ini files."
+msgstr ""
+
+#: en/help_topics/configuration.txt:233
+msgid ""
+"Section headers\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:236
+msgid ""
+"A section header is a word enclosed in brackets that starts at the begining\n"
+"of a line.  A typical section header looks like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:239
+msgid "    [DEFAULT]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:241
+msgid ""
+"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
+"[ALIASES].  Section headers are case sensitive. The default section provides "
+"for\n"
+"setting options which can be overridden with the branch config file."
+msgstr ""
+
+#: en/help_topics/configuration.txt:245
+msgid ""
+"For ``locations.conf``, the options from the section with the\n"
+"longest matching section header are used to the exclusion of other\n"
+"potentially valid section headers. A section header uses the path for\n"
+"the branch as the section header. Some examples include::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:250
+msgid ""
+"    [http://mybranches.isp.com/~jdoe/branchdir]\n"
+"    [/home/jdoe/branches/]"
+msgstr ""
+
+#: en/help_topics/configuration.txt:253
+msgid ""
+"\n"
+"Section options\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:257
+msgid ""
+"A section option resides within a section. A section option contains an\n"
+"option name, an equals sign and a value.  For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:260
+msgid ""
+"    email            = John Doe <jdoe@isp.com>\n"
+"    gpg_signing_key  = Amy Pond <amy@example.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:263
+msgid ""
+"A option can reference other options by enclosing them in curly brackets::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:265
+msgid ""
+"    my_branch_name = feature_x\n"
+"    my_server      = bzr+ssh://example.com\n"
+"    push_location   = {my_server}/project/{my_branch_name}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:269
+msgid ""
+"Option policies\n"
+"^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:272
+msgid ""
+"Options defined in a section affect the named directory or URL plus\n"
+"any locations they contain.  Policies can be used to change how an\n"
+"option value is interpreted for contained locations.  Currently\n"
+"there are three policies available:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:277
+msgid ""
+" none:\n"
+"   the value is interpreted the same for contained locations.  This is\n"
+"   the default behaviour.\n"
+" norecurse:\n"
+"   the value is only used for the exact location specified by the\n"
+"   section name.\n"
+" appendpath:\n"
+"   for contained locations, any additional path components are\n"
+"   appended to the value."
+msgstr ""
+
+#: en/help_topics/configuration.txt:287
+msgid ""
+"Policies are specified by keys with names of the form "
+"\"<option_name>:policy\".\n"
+"For example, to define the push location for a tree of branches, the\n"
+"following could be used::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:291
+msgid ""
+"  [/top/location]\n"
+"  push_location = sftp://example.com/location\n"
+"  push_location:policy = appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:295
+msgid ""
+"With this configuration, the push location for ``/top/location/branch1``\n"
+"would be ``sftp://example.com/location/branch1``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:298
+msgid ""
+"Section local options\n"
+"^^^^^^^^^^^^^^^^^^^^^"
+msgstr ""
+
+#: en/help_topics/configuration.txt:301
+msgid ""
+"Some options are defined automatically inside a given section and can be\n"
+"refered to in this section only. "
+msgstr ""
+
+#: en/help_topics/configuration.txt:304
+msgid "For example, the ``appendpath`` policy can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:306
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr\n"
+"  mypush:policy=appendpath"
+msgstr ""
+
+#: en/help_topics/configuration.txt:310
+msgid "Using ``relpath`` to achieve the same result is done like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:312
+msgid ""
+"  [/home/vila/src/bzr/bugs]\n"
+"  mypush = lp:~vila/bzr/{relpath}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:315
+msgid ""
+"In both cases, when used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
+msgid ""
+"   $ bzr config mypush\n"
+"   lp:~vila/bzr/832013-expand-in-stack"
+msgstr ""
+
+#: en/help_topics/configuration.txt:321
+msgid "Another such option is ``basename`` which can be used like this::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:323
+msgid ""
+"  [/home/vila/src/bzr]\n"
+"  mypush = lp:~vila/bzr/{basename}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:326
+msgid ""
+"When used in a directory like\n"
+"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:332
+msgid ""
+"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
+"itself is defined as the relative path between the section name and the\n"
+"location it matches."
+msgstr ""
+
+#: en/help_topics/configuration.txt:336
+msgid ""
+"When an option is local to a Section, it cannot be referred to from option\n"
+"values in any other section from the same ``Store`` nor from any other\n"
+"``Store``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:340
+msgid ""
+"\n"
+"The main configuration file, bazaar.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:344
+msgid ""
+"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
+"The default section contains the default\n"
+"configuration options for all branches. The default section can be\n"
+"overriden by providing a branch-specific section in ``locations.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:349
+msgid "A typical ``bazaar.conf`` section often looks like the following::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:351
+msgid ""
+"    [DEFAULT]\n"
+"    email             = John Doe <jdoe@isp.com>\n"
+"    editor            = /usr/bin/vim\n"
+"    create_signatures = when-required"
+msgstr ""
+
+#: en/help_topics/configuration.txt:356
+msgid ""
+"\n"
+"The branch location configuration file, locations.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:360
+msgid ""
+"``locations.conf`` allows one to specify overriding settings for\n"
+"a specific branch. The format is almost identical to the default section in\n"
+"bazaar.conf with one significant change: The section header, instead of "
+"saying\n"
+"default, will be the path to a branch that you wish to override a value\n"
+"for. The '?' and '*' wildcards are supported::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:366
+msgid ""
+"    [/home/jdoe/branches/nethack]\n"
+"    email = Nethack Admin <nethack@nethack.com>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:369
+msgid ""
+"    [http://hypothetical.site.com/branches/devel-branch]\n"
+"    create_signatures = always"
+msgstr ""
+
+#: en/help_topics/configuration.txt:372
+msgid ""
+"The authentication configuration file, authentication.conf\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:375
+msgid ""
+"``authentication.conf`` allows one to specify credentials for\n"
+"remote servers. This can be used for all the supported transports and any "
+"part\n"
+"of bzr that requires authentication (smtp for example)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:379
+msgid ""
+"The syntax of the file obeys the same rules as the others except for the\n"
+"option policies which don't apply."
+msgstr ""
+
+#: en/help_topics/configuration.txt:382
+msgid ""
+"For more information on the possible uses of the authentication "
+"configuration\n"
+"file see :doc:`authentication-help`."
+msgstr ""
+
+#: en/help_topics/configuration.txt:385
+msgid ""
+"\n"
+"Common options\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:389
+msgid ""
+"debug_flags\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:392
+msgid ""
+"A comma-separated list of debugging options to turn on.  The same values\n"
+"can be used as with the -D command-line option (see `help global-options`).\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:396
+msgid "    debug_flags = hpss"
+msgstr ""
+
+#: en/help_topics/configuration.txt:400
+msgid "    debug_flags = hpss,evil"
+msgstr ""
+
+#: en/help_topics/configuration.txt:402
+msgid ""
+"email\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:405
+msgid ""
+"The email address to use when committing a branch. Typically takes the form\n"
+"of::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:408
+msgid "    email = Full Name <account@hostname.tld>"
+msgstr ""
+
+#: en/help_topics/configuration.txt:410
+msgid ""
+"editor\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:413
+msgid ""
+"The path of the editor that you wish to use if *bzr commit* is run without\n"
+"a commit message. This setting is trumped by the environment variable\n"
+"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
+"variables."
+msgstr ""
+
+#: en/help_topics/configuration.txt:418
+msgid ""
+"log_format\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:421
+msgid ""
+"The default log format to use. Standard log formats are ``long``, ``short``\n"
+"and ``line``. Additional formats may be provided by plugins. The default\n"
+"value is ``long``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:425
+msgid ""
+"check_signatures\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:428
+msgid ""
+"Reserved for future use.  These options will allow a policy for branches to\n"
+"require signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:431
+msgid ""
+"require\n"
+"    The gnupg signature for revisions must be present and must be valid."
+msgstr ""
+
+#: en/help_topics/configuration.txt:434
+msgid ""
+"ignore\n"
+"    Do not check gnupg signatures of revisions."
+msgstr ""
+
+#: en/help_topics/configuration.txt:437
+msgid ""
+"check-available\n"
+"    (default) If gnupg signatures for revisions are present, check them.\n"
+"    Bazaar will fail if it finds a bad signature, but will not fail if\n"
+"    no signature is present."
+msgstr ""
+
+#: en/help_topics/configuration.txt:442
+msgid ""
+"create_signatures\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:445
+msgid ""
+"Defines the behaviour of signing revisions on commits.  By default bzr will "
+"not\n"
+"sign new commits."
+msgstr ""
+
+#: en/help_topics/configuration.txt:448
+msgid ""
+"always\n"
+"    Sign every new revision that is committed.  If the signing fails then "
+"the\n"
+"    commit will not be made."
+msgstr ""
+
+#: en/help_topics/configuration.txt:452
+msgid ""
+"when-required\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:455
+msgid ""
+"never\n"
+"    Reserved for future use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:458
+msgid ""
+"In future it is planned that ``when-required`` will sign newly\n"
+"committed revisions only when the branch requires them.  ``never`` will "
+"refuse\n"
+"to sign newly committed revisions, even if the branch requires signatures."
+msgstr ""
+
+#: en/help_topics/configuration.txt:462
+msgid ""
+"dirstate.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:465
+msgid ""
+"If true (default), working tree metadata changes are flushed through the\n"
+"OS buffers to physical disk.  This is somewhat slower, but means data\n"
+"should not be lost if the machine crashes.  See also repository.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:469
+msgid ""
+"gpg_signing_key\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:472
+msgid ""
+"The GnuPG user identity to use when signing commits.  Can be an e-mail\n"
+"address, key fingerprint or full key ID.  When unset or when set to\n"
+"\"default\" Bazaar will use the user e-mail set with ``whoami``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:476
+msgid ""
+"recurse\n"
+"~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:479
+msgid ""
+"Only useful in ``locations.conf``. Defines whether or not the\n"
+"configuration for this section applies to subdirectories:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:482
+msgid ""
+"true\n"
+"    (default) This section applies to subdirectories as well."
+msgstr ""
+
+#: en/help_topics/configuration.txt:485
+msgid ""
+"false\n"
+"    This section only applies to the branch at this directory and not\n"
+"    branches below it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:489
+msgid ""
+"gpg_signing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:492
+msgid ""
+"(Default: \"gpg\"). Which program should be used to sign and check "
+"revisions.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:495
+msgid "    gpg_signing_command = /usr/bin/gnpg"
+msgstr ""
+
+#: en/help_topics/configuration.txt:497
+msgid ""
+"The specified command must accept the options \"--clearsign\" and \"-u "
+"<email>\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:499
+msgid ""
+"bzr_remote_path\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:502
+msgid ""
+"(Default: \"bzr\").  The path to the command that should be used to run the "
+"smart\n"
+"server for bzr.  This value may only be specified in locations.conf, because:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:505
+msgid ""
+"- it's needed before branch.conf is accessible\n"
+"- allowing remote branch.conf files to specify commands would be a security\n"
+"  risk"
+msgstr ""
+
+#: en/help_topics/configuration.txt:509
+msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
+msgstr ""
+
+#: en/help_topics/configuration.txt:511
+msgid ""
+"smtp_server\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:514
+msgid ""
+"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
+"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
+msgstr ""
+
+#: en/help_topics/configuration.txt:517
+msgid ""
+"smtp_username, smtp_password\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:520
+msgid ""
+"User and password to authenticate to the SMTP server. If smtp_username\n"
+"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
+"These settings are only needed if the SMTP server requires authentication\n"
+"to send mail."
+msgstr ""
+
+#: en/help_topics/configuration.txt:525
+msgid ""
+"locks.steal_dead\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:528
+msgid ""
+"If set to true, bzr will automatically break locks held by processes from\n"
+"the same machine and user that are no longer alive.  Otherwise, it will\n"
+"print a message and you can break the lock manually, if you are satisfied\n"
+"the object is no longer in use."
+msgstr ""
+
+#: en/help_topics/configuration.txt:533
+msgid ""
+"mail_client\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:536
+msgid ""
+"A mail client to use for sending merge requests.\n"
+"By default, bzr will try to use ``mapi`` on Windows.  On other platforms, "
+"it\n"
+"will try ``xdg-email``. If either of these fails, it will fall back to\n"
+"``editor``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:541
+msgid "Supported values for specific clients:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:543
+msgid ""
+":claws: Use Claws.  This skips a dialog for attaching files.\n"
+":evolution: Use Evolution.\n"
+":kmail: Use KMail.\n"
+":mutt: Use Mutt.\n"
+":thunderbird: Use Mozilla Thunderbird or Icedove.  For Thunderbird/Icedove "
+"1.5,\n"
+"    this works around some bugs that xdg-email doesn't handle."
+msgstr ""
+
+#: en/help_topics/configuration.txt:550
+msgid "Supported generic values are:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:552
+msgid ""
+":default: See above.\n"
+":editor: Use your editor to compose the merge request.  This also uses\n"
+"    your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
+"    smtp_username and smtp_password.\n"
+":mapi: Use your preferred e-mail client on Windows.\n"
+":xdg-email: Use xdg-email to run your preferred mail program"
+msgstr ""
+
+#: en/help_topics/configuration.txt:559
+msgid ""
+"repository.fdatasync\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:562
+msgid ""
+"If true (default), repository changes are flushed through the OS buffers\n"
+"to physical disk.  This is somewhat slower, but means data should not be\n"
+"lost if the machine crashes.  See also dirstate.fdatasync."
+msgstr ""
+
+#: en/help_topics/configuration.txt:566
+msgid ""
+"submit_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:569
+msgid ""
+"The branch you intend to submit your current work to.  This is "
+"automatically\n"
+"set by ``bzr send``, and is also used by the ``submit:`` revision spec.  "
+"This\n"
+"should usually be set on a per-branch or per-location basis."
+msgstr ""
+
+#: en/help_topics/configuration.txt:573
+msgid ""
+"public_branch\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:576
+msgid ""
+"A publically-accessible version of this branch (implying that this version "
+"is\n"
+"not publically-accessible).  Used (and set) by ``bzr send``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:579
+msgid ""
+"suppress_warnings\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:582
+msgid ""
+"A list of strings, each string represent a warning that can be emitted by\n"
+"bzr. Mentioning a warning in this list tells bzr to not emit it."
+msgstr ""
+
+#: en/help_topics/configuration.txt:585
+msgid "Valid values:"
+msgstr ""
+
+#: en/help_topics/configuration.txt:587
+msgid ""
+"* ``format_deprecation``:\n"
+"    whether the format deprecation warning is shown on repositories that "
+"are\n"
+"    using deprecated formats."
+msgstr ""
+
+#: en/help_topics/configuration.txt:591
+msgid ""
+"default_format\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:594
+msgid ""
+"A format name for the default format used when creating branches.  See "
+"``bzr\n"
+"help formats`` for possible values."
+msgstr ""
+
+#: en/help_topics/configuration.txt:597
+msgid ""
+"\n"
+"Unicode options\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:601
+msgid ""
+"output_encoding\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:604
+msgid ""
+"A Python unicode encoding name for text output from bzr, such as log\n"
+"information.  Values include: utf8, cp850, ascii, iso-8859-1.  The default\n"
+"is the terminal encoding prefered by the operating system."
+msgstr ""
+
+#: en/help_topics/configuration.txt:608
+msgid ""
+"\n"
+"Branch type specific options\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:612
+msgid ""
+"These options apply only to branches that use the ``dirstate-tags`` or\n"
+"later format.  They\n"
+"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
+"manually set in ``locations.conf`` or ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:617
+msgid ""
+"append_revisions_only\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:620
+msgid ""
+"If set to \"True\" then revisions can only be appended to the log, not\n"
+"removed.  A branch with this setting enabled can only pull from another\n"
+"branch if the other branch's log is a longer version of its own.  This is\n"
+"normally set by ``bzr init --append-revisions-only``. If you set it\n"
+"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
+"compatibility with previous bzr versions (older than 2.2)."
+msgstr ""
+
+#: en/help_topics/configuration.txt:627
+msgid ""
+"parent_location\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:630
+msgid ""
+"If present, the location of the default branch for pull or merge.  This "
+"option\n"
+"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
+"--remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:634
+msgid ""
+"push_location\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:637
+msgid ""
+"If present, the location of the default branch for push.  This option\n"
+"is normally set by the first ``push`` or ``push --remember``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:640
+msgid ""
+"push_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:643
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing."
+msgstr ""
+
+#: en/help_topics/configuration.txt:646
+msgid ""
+"dpush_strict\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:649
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before pushing into a different VCS without any\n"
+"custom bzr metadata."
+msgstr ""
+
+#: en/help_topics/configuration.txt:653
+msgid ""
+"bound_location\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:656
+msgid ""
+"The location that commits should go to when acting as a checkout.\n"
+"This option is normally set by ``bind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:659
+msgid ""
+"bound\n"
+"~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:662
+msgid ""
+"If set to \"True\", the branch should act as a checkout, and push each "
+"commit to\n"
+"the bound_location.  This option is normally set by ``bind``/``unbind``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:665
+msgid ""
+"send_strict\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:668
+msgid ""
+"If present, defines the ``--strict`` option default value for checking\n"
+"uncommitted changes before sending a merge directive."
+msgstr ""
+
+#: en/help_topics/configuration.txt:671
+msgid ""
+"add.maximum_file_size\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:674
+msgid ""
+"Defines the maximum file size the command line \"add\" operation will allow\n"
+"in recursive mode, with files larger than this value being skipped. You may "
+"\n"
+"specify this value as an integer (in which case it is interpreted as bytes), "
+"\n"
+"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
+"0 \n"
+"will disable skipping."
+msgstr ""
+
+#: en/help_topics/configuration.txt:680
+msgid ""
+"External Merge Tools\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/configuration.txt:683
+msgid ""
+"bzr.mergetool.<name>\n"
+"~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:686
+msgid ""
+"Defines an external merge tool called <name> with the given command-line.\n"
+"Arguments containing spaces should be quoted using single or double quotes. "
+"The\n"
+"executable may omit its path if it can be found on the PATH."
+msgstr ""
+
+#: en/help_topics/configuration.txt:690
+msgid ""
+"The following markers can be used in the command-line to substitute "
+"filenames\n"
+"involved in the merge conflict::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:693
+msgid ""
+"  {base}      file.BASE\n"
+"  {this}      file.THIS\n"
+"  {other}     file.OTHER\n"
+"  {result}    output file\n"
+"  {this_temp} temp copy of file.THIS, used to overwrite output file if "
+"merge\n"
+"              succeeds."
+msgstr ""
+
+#: en/help_topics/configuration.txt:702
+msgid "  bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:704
+msgid ""
+"bzr.default_mergetool\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/configuration.txt:707
+msgid ""
+"Specifies which external merge tool (as defined above) should be selected "
+"by\n"
+"default in tools such as ``bzr qconflicts``."
+msgstr ""
+
+#: en/help_topics/configuration.txt:712
+msgid "  bzr.default_mergetool = kdiff3\n"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:1
+msgid ""
+"Conflict Types\n"
+"=============="
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:4
+msgid ""
+"Some operations, like merge, revert and pull, modify the contents of your\n"
+"working tree.  These modifications are programmatically generated, and so "
+"they\n"
+"may conflict with the current state of your working tree. "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:8
+msgid ""
+"When conflicts are present in your working tree (as shown by ``bzr\n"
+"conflicts``), you should resolve them and then inform bzr that the "
+"conflicts\n"
+"have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:12
+msgid ""
+"Resolving conflicts is sometimes not obvious. Either because the user that\n"
+"should resolve them is not the one responsible for their occurrence, as is "
+"the\n"
+"case when merging other people's work or because some conflicts are "
+"presented\n"
+"in a way that is not easy to understand."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:17
+msgid ""
+"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
+"conflict if and only if there's an actual conceptual conflict in the source\n"
+"tree.  Because Bazaar doesn't understand the real meaning of the files "
+"being\n"
+"versioned, it can, when faced with ambiguities, fall short in either "
+"direction\n"
+"trying to resolve the conflict itself. Many kinds of changes can be "
+"combined\n"
+"programmatically, but sometimes only a human can determine the right thing "
+"to\n"
+"do."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:25
+msgid ""
+"When Bazaar generates a conflict, it adds information into the working tree "
+"to\n"
+"present the conflicting versions, and it's up to you to find the correct\n"
+"resolution."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:29
+msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:31
+msgid ""
+"1. Modify the working tree content so that the conflicted item is now in "
+"the\n"
+"   state you want to keep, then"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:34
+msgid ""
+"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
+"   remaining generated information (``bzr resolve <item>``)."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:37
+msgid ""
+"For most conflict types, there are some obvious ways to modify the working\n"
+"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
+"itself already made a choice, when possible."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:41
+msgid ""
+"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
+"different ways to resolve the conflict."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:44
+msgid ""
+"Each type of conflict is explained below, and the action which must be done "
+"to\n"
+"resolve the conflict is outlined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:47
+msgid ""
+"Various actions are available depending on the kind of conflict, for some "
+"of\n"
+"these actions, Bazaar can provide some help. In the end you should at least\n"
+"inform Bazaar that you're done with the conflict with::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:51
+msgid "  ``bzr resolve FILE --action=done'"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:53
+msgid ""
+"Note that this is the default action when a single file is involved so you "
+"can\n"
+"simply use::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:56
+msgid "   ``bzr resolve FILE``"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:58
+msgid "See ``bzr help resolve`` for more details."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:60
+msgid ""
+"Text conflicts\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
+#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
+#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
+#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
+#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
+msgid "Typical message::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:65
+msgid "  Text conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:67
+msgid ""
+"These are produced when a text merge cannot completely reconcile two sets "
+"of\n"
+"text changes.  Bazaar will emit files for each version with the extensions\n"
+"THIS, OTHER, and BASE.  THIS is the version of the file from the target "
+"tree,\n"
+"i.e. the tree that you are merging changes into.  OTHER is the version that "
+"you\n"
+"are merging into the target.  BASE is an older version that is used as a "
+"basis\n"
+"for comparison."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:74
+msgid ""
+"In the main copy of the file, Bazaar will include all the changes that it\n"
+"could reconcile, and any un-reconciled conflicts are surrounded by\n"
+"\"herringbone\" markers like ``<<<<<<<``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:78
+msgid ""
+"Say the initial text is \"The project leader released it.\", and THIS "
+"modifies it\n"
+"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
+"leader\n"
+"released Bazaar.\"  A conflict would look like this::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:82
+msgid ""
+"  <<<<<<< TREE\n"
+"  Martin Pool released it.\n"
+"  =======\n"
+"  The project leader released Bazaar.\n"
+"  >>>>>>> MERGE-SOURCE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:88
+msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:90
+msgid ""
+"You can handle text conflicts either by editing the main copy of the file,\n"
+"or by invoking external tools on the THIS, OTHER and BASE versions.  It's\n"
+"worth mentioning that resolving text conflicts rarely involves picking one\n"
+"set of changes over the other (but see below when you encounter these\n"
+"cases).  More often, the two sets of changes must be intelligently combined."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:96
+msgid ""
+"If you edit the main copy, be sure to remove the herringbone markers.  When\n"
+"you are done editing, the file should look like it never had a conflict, and "
+"be\n"
+"ready to commit."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:100
+msgid ""
+"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
+"Bazaar will auto-detect which conflicts you have resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:103
+msgid ""
+"When the conflict is resolved, Bazaar deletes the previously generated\n"
+"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
+"working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:107
+msgid ""
+"\n"
+"When you want to pick one set of changes over the other, you can use ``bzr\n"
+"resolve`` with one of the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:111
+msgid ""
+"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:114
+msgid ""
+"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
+"modifications will be taken into account."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:117
+msgid ""
+"Content conflicts\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:122
+msgid "  Contents conflict in FILE"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:124
+msgid ""
+"This conflict happens when there are conflicting changes in the working "
+"tree\n"
+"and the merge source, but the conflicted items are not text files.  They "
+"may\n"
+"be binary files, or symlinks, or directories.  It can even happen with "
+"files\n"
+"that are deleted on one side, and modified on the other."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:129
+msgid ""
+"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files.  (They may "
+"be\n"
+"regular files, symlinks or directories).  But it will not include a \"main "
+"copy\"\n"
+"of the file with herringbone conflict markers.  It will appear that the "
+"\"main\n"
+"copy\" has been renamed to THIS or OTHER."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
+msgid ""
+"To resolve that kind of conflict, you should rebuild FILE from either "
+"version\n"
+"or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
+#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
+#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
+#: en/help_topics/conflict-types.txt:361
+msgid "``bzr resolve`` recognizes the following actions:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:139
+msgid ""
+"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:143
+msgid ""
+"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
+"and\n"
+"``.OTHER`` files if they are still present in the working tree."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
+#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
+#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
+#: en/help_topics/conflict-types.txt:369
+msgid ""
+"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:148
+msgid ""
+"Tag conflicts\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:153
+msgid ""
+"  Conflicting tags:\n"
+"      version-0.1"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:156
+msgid ""
+"When pulling from or pushing to another branch, Bazaar informs you about "
+"tags\n"
+"that conflict between the two branches; that is the same tag points to two\n"
+"different revisions.  You need not resolve these conflicts, but subsequent\n"
+"uses of pull or push will result in the same message."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:161
+msgid ""
+"To resolve the conflict, you must apply the correct tags to either the "
+"target\n"
+"branch or the source branch as appropriate.  Use \"bzr tags --show-ids -d\n"
+"SOURCE_URL\" to see the tags in the source branch.  If you want to make the\n"
+"target branch's tags match the source branch, then in the target branch do\n"
+"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
+"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
+"source\n"
+"branch.  You need not call \"bzr resolve\" after doing this.  To resolve in\n"
+"favor of the target branch, you need to similarly use ``tag --force`` in "
+"the\n"
+"source branch.  (Note that pulling or pushing using --overwrite will "
+"overwrite\n"
+"all tags as well.)"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:172
+msgid ""
+"Duplicate paths\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:177
+msgid "  Conflict adding file FILE.  Moved existing file to FILE.moved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:179
+msgid ""
+"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
+"already been used.  The existing file will be renamed to \"FILE.moved\".  "
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:187
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
+"FILE``,\n"
+"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:191
+msgid ""
+"Note that you must get rid of FILE.moved before using ``--action=done``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:195
+msgid ""
+"Unversioned parent\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:200
+msgid ""
+"    Conflict because FILE is not versioned, but has versioned children."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:202
+msgid ""
+"Sometimes Bazaar will attempt to create a file whose parent directory is "
+"not\n"
+"versioned.  This happens when the directory has been deleted in the target,\n"
+"but has a new child in the source, or vice versa.  In this situation, "
+"Bazaar\n"
+"will version the parent directory as well.  Resolving this issue depends\n"
+"very much on the particular scenario.  You may wish to rename or delete "
+"either\n"
+"the file or the directory.  When you are satisfied, you can run \"bzr "
+"resolve\n"
+"FILE\" to mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:210
+msgid ""
+"Missing parent\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:215
+msgid "  Conflict adding files to FILE.  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:217
+msgid ""
+"This happens when a directory has been deleted in the target, but has new\n"
+"children in the source.  This is similar to the \"unversioned parent\" "
+"conflict,\n"
+"except that the parent directory does not *exist*, instead of just being\n"
+"unversioned.  In this situation, Bazaar will create the missing parent.\n"
+"Resolving this issue depends very much on the particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
+msgid ""
+"To resolve that kind of conflict, you should either remove or rename the\n"
+"children or the directory or a combination of both."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:228
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
+"  children,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
+"children\n"
+"  and restoring the directory,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:236
+msgid ""
+"Deleting parent\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:241
+msgid "  Conflict: can't delete DIR because it is not empty.  Not deleting."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:243
+msgid ""
+"This is the opposite of \"missing parent\".  A directory is deleted in the\n"
+"source, but has new children in the target (either because a directory\n"
+"deletion is merged or because the merge introduce new children).  Bazaar\n"
+"will retain the directory.  Resolving this issue depends very much on the\n"
+"particular scenario."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:254
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
+"directory,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:256
+msgid ""
+"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
+"  children,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:259
+msgid "* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:261
+msgid ""
+"Note that when merging a directory deletion, if unversioned files are\n"
+"present, they become potential orphans has they don't have a directory\n"
+"parent anymore."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:265
+msgid ""
+"Handling such orphans, *before* the conflict is created, is controlled by\n"
+"setting the ``bzr.transform.orphan_policy`` configuration option."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:268
+msgid "There are two possible values for this option:"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:270
+msgid ""
+"* ``conflict`` (the default): will leave the orphans in place and\n"
+"  generate a conflicts,"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:273
+msgid ""
+"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
+"root\n"
+"  of the working tree with names like ``<file>.~#~``."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:278
+msgid ""
+"Path conflict\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:283
+msgid "  Path conflict: PATH1 / PATH2"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:285
+msgid ""
+"This happens when the source and target have each modified the name or "
+"parent\n"
+"directory of a file.  Bazaar will use the path elements from the source."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:288
+msgid ""
+"To resolve that kind of conflict, you just have to decide what name should "
+"be\n"
+"retained for the file involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:293
+msgid ""
+"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
+"  issuing ``bzr mv PATH2 PATH1``,\n"
+"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
+"``PATH2``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:300
+msgid ""
+"Parent loop\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:305
+msgid "  Conflict moving FILE into DIRECTORY.  Cancelled move."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:307
+msgid ""
+"This happens when the source and the target have each moved directories, so\n"
+"that, if the change could be applied, a directory would be contained by "
+"itself.\n"
+"For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:311
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir white\n"
+"  $ bzr mkdir black\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ bzr mv white black\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mv ../other/black ../other/white\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:322
+msgid ""
+"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
+"``black``.  To resolve that kind of conflict, you just have to decide what\n"
+"name should be retained for the directories involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:328
+msgid ""
+"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
+"\n"
+"  in ``black``,\n"
+"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
+"   ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:336
+msgid ""
+"Non-directory parent\n"
+"--------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:341
+msgid ""
+"  Conflict: foo.new is not a directory, but has files in it.\n"
+"  Created directory."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:344
+msgid ""
+"This happens when one side has added files to a directory, and the other "
+"side\n"
+"has changed the directory into a file or symlink.  For example::"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:347
+msgid ""
+"  $ bzr init\n"
+"  $ bzr mkdir foo\n"
+"  $ bzr commit -m \"BASE\"\n"
+"  $ bzr branch . ../other\n"
+"  $ rmdir foo\n"
+"  $ touch foo\n"
+"  $ bzr commit -m \"THIS\"\n"
+"  $ bzr mkdir ../other/foo/bar\n"
+"  $ bzr commit ../other -m \"OTHER\"\n"
+"  $ bzr merge ../other"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:358
+msgid ""
+"To resolve that kind of conflict, you have to decide what name should be\n"
+"retained for the file, directory or symlink involved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:363
+msgid ""
+"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
+"  ``bzr add foo``,\n"
+"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
+"  ``bzr mv foo.new foo``,\n"
+"* ``--action=done`` will just mark the conflict as resolved."
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:371
+msgid ""
+"MalformedTransform\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/conflict-types.txt:374
+msgid ""
+"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
+"exception.  This means that Bazaar encountered a filesystem conflict that it "
+"was\n"
+"unable to resolve.  This usually indicates a bug.  Please let us know if "
+"you\n"
+"encounter this.  Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:1
+msgid ""
+"Content Filters\n"
+"==============="
+msgstr ""
+
+#: en/help_topics/content-filters.txt:4
+msgid ""
+"Content formats\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:7
+msgid ""
+"Bazaar's content filtering allows you to store files in a different\n"
+"format from the copy in your working tree.  This lets you, or your\n"
+"co-developers, use Windows development tools that expect CRLF files\n"
+"on projects that use other line-ending conventions. Among other things,\n"
+"content filters also let Unix developers more easily work on projects\n"
+"using Windows line-ending conventions, keyword expansion/compression,\n"
+"and trailing spaces on lines in text files to be implicitly stripped\n"
+"when committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:16
+msgid "To generalize, there are two content formats supported by Bazaar:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:18
+msgid ""
+"* a canonical format - how files are stored internally\n"
+"* a convenience format - how files are created in a working tree."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:21
+msgid ""
+"\n"
+"Format conversion\n"
+"-----------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:25
+msgid ""
+"The conversion between these formats is done by content filters.\n"
+"A content filter has two parts:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:28
+msgid ""
+"* a read converter - converts from convenience to canonical format\n"
+"* a write converter - converts from canonical to convenience format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:31
+msgid ""
+"Many of these converters will provide *round-trip* conversion,\n"
+"i.e. applying the read converter followed by the write converter\n"
+"gives back the original content. However, others may provide an\n"
+"asymmetric conversion. For example, a read converter might strip\n"
+"trailing whitespace off lines in source code while the matching\n"
+"write converter might pass content through unchanged."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:38
+msgid ""
+"\n"
+"Enabling content filters\n"
+"------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:42
+msgid ""
+"Content filters are typically provided by plugins, so the first step\n"
+"in using them is to install the relevant plugins and read their\n"
+"documentation. Some plugins may be very specific about which files\n"
+"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
+"In other cases, the plugin may leave it in the user's hands to\n"
+"define which files are to be filtered. This is typically done\n"
+"using rule-based preferences. See ``bzr help rules`` for general\n"
+"information about defining these."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:51
+msgid ""
+"\n"
+"Impact on commands\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:55
+msgid ""
+"Read converters are only applied to commands that read content from\n"
+"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
+"will apply read converters to files in the working tree, then compare\n"
+"the results to the content last committed."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:60
+msgid ""
+"Write converters are only applied by commands that **create files in a\n"
+"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
+"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
+"respectively."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:65
+msgid ""
+"Note: ``bzr commit`` does not implicitly apply write converters after\n"
+"comitting files. If this makes sense for a given plugin providing\n"
+"a content filter, the plugin can usually achieve this effect by using a\n"
+"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
+"for more information on hooks."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:71
+msgid ""
+"\n"
+"Refreshing your working tree\n"
+"----------------------------"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:75
+msgid ""
+"For performance reasons, Bazaar caches the timestamps of files in\n"
+"a working tree, and assumes files are unchanged if their timestamps\n"
+"match the cached values. As a consequence, there are times when\n"
+"you may need to explicitly ask for content filtering to be reapplied\n"
+"in one or both directions, e.g. after installing or reconfiguring\n"
+"plugins providing it."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:82
+msgid "Here are some general guidelines for doing this:"
+msgstr ""
+
+#: en/help_topics/content-filters.txt:84
+msgid ""
+" * To reapply read converters, ``touch`` files, i.e. update their\n"
+"   timestamp. Operations like ``bzr status`` should then reapply the\n"
+"   relevant read converters and compare the end result with the\n"
+"   canonical format."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:89
+msgid ""
+" * To reapply write converters, ensure there are no local changes,\n"
+"   delete the relevant files and run ``bzr revert`` on those files."
+msgstr ""
+
+#: en/help_topics/content-filters.txt:92
+msgid ""
+"Note: In the future, it is likely that additional options will be added\n"
+"to commands to make this refreshing process faster and safer.\n"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:1
+msgid "Current Storage Formats"
+msgstr ""
+
+#: en/help_topics/current-formats.txt:3
+msgid ""
+":2a:\n"
+"    (native) (default) Format for the bzr 2.0 series. Uses group-\n"
+"    compress storage. Provides rich roots which are a one-way\n"
+"    transition."
+msgstr ""
+
+#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
+msgid ""
+"\n"
+"See :doc:`formats-help` for more about storage formats."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:1
+msgid ""
+"Debug Flags\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:4
+msgid ""
+"These flags can be passed on the bzr command line or (without the ``-D``\n"
+"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
+msgstr ""
+
+#: en/help_topics/debug-flags.txt:7
+msgid ""
+"-Dauth            Trace authentication sections used.\n"
+"-Dbytes           Print out how many bytes were transferred\n"
+"-Ddirstate        Trace dirstate activity (verbose!)\n"
+"-Derror           Instead of normal error handling, always print a "
+"traceback\n"
+"                  on error.\n"
+"-Devil            Capture call sites that do expensive or badly-scaling\n"
+"                  operations.\n"
+"-Dfetch           Trace history copying between repositories.\n"
+"-Dfilters         Emit information for debugging content filtering.\n"
+"-Dforceinvdeltas  Force use of inventory deltas during generic streaming "
+"fetch.\n"
+"-Dgraph           Trace graph traversal.\n"
+"-Dhashcache       Log every time a working file is read to determine its "
+"hash.\n"
+"-Dhooks           Trace hook execution.\n"
+"-Dhpss            Trace smart protocol requests and responses.\n"
+"-Dhpssdetail      More hpss details.\n"
+"-Dhpssvfs         Traceback on vfs access to Remote objects.\n"
+"-Dhttp            Trace http connections, requests and responses.\n"
+"-Dindex           Trace major index operations.\n"
+"-Dknit            Trace knit operations.\n"
+"-Dlock            Trace when lockdir locks are taken or released.\n"
+"-Dnoretry         If a connection is reset, fail immediately rather than\n"
+"                  retrying the request.\n"
+"-Dprogress        Trace progress bar operations.\n"
+"-Dmem_dump        Dump memory to a file upon an out of memory error.\n"
+"-Dmerge           Emit information for debugging merges.\n"
+"-Dno_apport       Don't use apport to report crashes.\n"
+"-Dno_activity \t  Don't show transport activity indicator in progress bar.\n"
+"-Dpack            Emit information about pack operations.\n"
+"-Drelock          Emit a message every time a branch or repository object "
+"is\n"
+"                  unlocked then relocked the same way.\n"
+"-Dsftp            Trace SFTP internals.\n"
+"-Dstatic_tuple    Error when a tuple is used where a StaticTuple is "
+"expected\n"
+"-Dstream          Trace fetch streams.\n"
+"-Dstrict_locks    Trace when OS locks are potentially used in a non-"
+"portable\n"
+"                  manner.\n"
+"-Dunlock          Some errors during unlock are treated as warnings.\n"
+"-DIDS_never       Never use InterDifferingSerializer when fetching.\n"
+"-DIDS_always      Always use InterDifferingSerializer to fetch if "
+"appropriate\n"
+"                  for the format, even for non-local fetches.\n"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:1
+msgid ""
+"Diverged Branches\n"
+"================="
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:4
+msgid ""
+"When Bazaar tries to push one branch onto another, it requires that the\n"
+"destination branch must be ready to receive the source branch.  If this "
+"isn't\n"
+"the case, then we say that the branches have ``diverged``.  Branches are\n"
+"considered diverged if the destination branch's most recent commit is one "
+"that\n"
+"has not been merged (directly or indirectly) by the source branch.  To "
+"recover\n"
+"from diverged branches, one must merge the missing revisions into the "
+"source\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:12
+msgid ""
+"This situation commonly arises when using a centralized workflow with local\n"
+"commits.  If someone else has committed new work to the mainline since your\n"
+"last pull and you have local commits that have not yet been pushed to the\n"
+"mainline, then your local branch and the mainline have diverged."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:17
+msgid ""
+"Discovering What Has Diverged\n"
+"-----------------------------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:20
+msgid ""
+"The ``bzr missing`` command is used to find out what revisions are in "
+"another\n"
+"branch that are not present in the current branch, and vice-versa.  It shows "
+"a\n"
+"summary of  which extra revisions exist in each branch.  If you want to see "
+"the\n"
+"precise effects of those revisions, you can use ``bzr diff --"
+"old=other_branch``\n"
+"to show the differences between other_branch and your current branch."
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:26
+msgid ""
+"A Solution\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/diverged-branches.txt:29
+msgid ""
+"The solution is to merge the revisions from the mainline into your local\n"
+"branch.  To do so, use ``bzr merge`` to get the new revisions from the\n"
+"mainline.  This merge may result in conflicts if the other developer's "
+"changes\n"
+"overlap with your changes.  These conflicts should be resolved before\n"
+"continuing. After any conflicts have been resolved, or even if there were "
+"no\n"
+"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
+"to your local branch.  This requirement gives you an opportunity to test "
+"the\n"
+"resulting working tree for correctness, since the merged revisions could "
+"have\n"
+"made arbitrary changes.  After testing, you should commit the merge using\n"
+"``bzr commit``.  This clears up the diverged branches situation.  Your "
+"local\n"
+"branch can now be pushed to the mainline.\n"
+msgstr ""
+
+#: en/help_topics/eol.txt:1
+msgid ""
+"End of Line Conversion\n"
+"======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:4
+msgid ""
+"EOL conversion is provided as a content filter where Bazaar internally\n"
+"stores a canonical format but outputs a convenience format. See\n"
+"``bzr help content-filters`` for general information about using these."
+msgstr ""
+
+#: en/help_topics/eol.txt:8
+msgid ""
+"Note: Content filtering is only supported in recently added formats,\n"
+"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
+"in a recent format. (Just setting the format on the repository\n"
+"is not enough.) If content filtering does not appear to be working, use\n"
+"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
+"or later."
+msgstr ""
+
+#: en/help_topics/eol.txt:15
+msgid ""
+"EOL conversion needs to be enabled for selected file patterns using\n"
+"rules. See ``bzr help rules`` for general information on defining rules.\n"
+"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
+"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
+"supported in a future verison of Bazaar."
+msgstr ""
+
+#: en/help_topics/eol.txt:21
+msgid ""
+"To configure which files to filter, set ``eol`` to one of the values below.\n"
+"(If a value is not set, ``exact`` is the default.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:24
+msgid ""
+" ========== ===================================== ======================\n"
+" Value      Checkout end-of-lines as              Commit end-of-lines as\n"
+" ========== ===================================== ======================\n"
+" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``lf``     ``lf``                                ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``crlf``   ``crlf``                              ``lf``\n"
+" ---------- ------------------------------------- ----------------------\n"
+" ``exact``  No conversion                         Exactly as in file\n"
+" ========== ===================================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:36
+msgid ""
+"Note: For safety reasons, no conversion is applied to any file where a null\n"
+"byte is detected in the file."
+msgstr ""
+
+#: en/help_topics/eol.txt:39
+msgid ""
+"For users working on a cross-platform project, here is a suggested rule\n"
+"to use as a starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
+#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
+msgid ""
+"  [name *]\n"
+"  eol = native"
+msgstr ""
+
+#: en/help_topics/eol.txt:45
+msgid ""
+"If you have binary files that do not contain a null byte though, be\n"
+"sure to add ``eol = exact`` rules for those as well. You can do this\n"
+"by giving more explicit patterns earlier in the rules file. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:49
+msgid ""
+"  [name *.png]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:55
+msgid ""
+"If your working tree is on a network drive shared by users on different\n"
+"operating systems, you typically want to force certain conventions for\n"
+"certain files. In that way, if a file is created with the wrong line\n"
+"endings or line endings get mixed during editing, it gets committed\n"
+"correctly and gets checked out correctly. For example::"
+msgstr ""
+
+#: en/help_topics/eol.txt:61
+msgid ""
+"  [name *.bat]\n"
+"  eol = crlf"
+msgstr ""
+
+#: en/help_topics/eol.txt:64
+msgid ""
+"  [name *.sh]\n"
+"  eol = lf"
+msgstr ""
+
+#: en/help_topics/eol.txt:70
+msgid ""
+"If you take the care to create files with their required endings, you can\n"
+"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
+"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
+"introducing mixed line endings will be corrected during commit for files\n"
+"with those settings."
+msgstr ""
+
+#: en/help_topics/eol.txt:76
+msgid ""
+"If you have sample test data that deliberately has text files with mixed\n"
+"newline conventions, you can ask for those to be left alone like this::"
+msgstr ""
+
+#: en/help_topics/eol.txt:79
+msgid ""
+"  [name test_data/]\n"
+"  eol = exact"
+msgstr ""
+
+#: en/help_topics/eol.txt:85
+msgid ""
+"Note that ``exact`` does not imply the file is binary but it does mean\n"
+"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
+"of content analysis to detect binary files for commands like ``diff``.\n"
+"In the future, a ``binary = true`` rule may be added but it is not\n"
+"supported yet.)"
+msgstr ""
+
+#: en/help_topics/eol.txt:91
+msgid ""
+"If you have an existing repository with text files already stored using\n"
+"Windows newline conventions (``crlf``), then you may want to keep using "
+"that\n"
+"convention in the repository. Forcing certain files to this convention\n"
+"may also help users who do not have rules configured. To do this, set\n"
+"``eol`` to one of the values below."
+msgstr ""
+
+#: en/help_topics/eol.txt:97
+msgid ""
+" ============================ ======================== "
+"======================\n"
+" Value                        Checkout end-of-lines as Commit end-of-lines "
+"as\n"
+" ============================ ======================== "
+"======================\n"
+" ``native-with-crlf-in-repo`` ``crlf`` on Windows,     ``crlf``\n"
+"                              ``lf`` otherwise\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``lf-with-crlf-in-repo``     ``lf``                   ``crlf``\n"
+" ---------------------------- ------------------------ ----------------------"
+"\n"
+" ``crlf-with-crlf-in-repo``   ``crlf``                 ``crlf``\n"
+" ============================ ======================== ======================"
+msgstr ""
+
+#: en/help_topics/eol.txt:108
+msgid ""
+"For users working on an existing project that uses Windows newline\n"
+"conventions in their Bazaar repository, this rule is suggested as a\n"
+"starting point::"
+msgstr ""
+
+#: en/help_topics/eol.txt:112
+msgid ""
+"  [name *]\n"
+"  eol = native-with-crlf-in-repo"
+msgstr ""
+
+#: en/help_topics/eol.txt:115
+msgid ""
+"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
+"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
+"``crlf`` and ``exact``."
+msgstr ""
+
+#: en/help_topics/eol.txt:119
+msgid ""
+"Note: Bazaar's EOL conversion will convert the content of files but\n"
+"never reject files because a given line ending or mixed line endings\n"
+"are found. A precommit hook should be used if you wish to validate\n"
+"(and not just convert) content before committing.\n"
+msgstr ""
+
+#: en/help_topics/hidden-commands.txt:1
+msgid ""
+"added                List files added in working tree.\n"
+"ancestry             List all revisions merged into this branch.\n"
+"assert-fail          Test reporting of assertion failures\n"
+"bundle-info          Output interesting stats about a bundle\n"
+"bundle-revisions     Create a merge-directive for submitting changes.\n"
+"cat-revision         Write out metadata for a revision.\n"
+"dump-btree           Dump the contents of a btree index file to stdout.\n"
+"export-pot           Export command helps and error messages in po format.\n"
+"file-id              Print file_id of a particular file or directory.\n"
+"file-path            Print path of file_ids to a file or directory.\n"
+"find-merge-base      Find and print a base revision for merging two "
+"branches.\n"
+"hooks                Show hooks.\n"
+"inventory            Show inventory of the current working copy or a "
+"revision.\n"
+"local-time-offset    Show the offset in seconds from GMT to local time.\n"
+"lookup-revision      Lookup the revision-id from a revision-number\n"
+"merge-directive      Generate a merge directive for auto-merge tools.\n"
+"modified             List files modified in working tree.\n"
+"re-sign              Create a digital signature for an existing revision.\n"
+"reference            list, view and set branch locations for nested trees.\n"
+"relpath              Show path of a file relative to root\n"
+"repair-workingtree   Reset the working tree state file.\n"
+"revision-history     Display the list of revision ids on a branch.\n"
+"revision-info        Show revision number and revision id for a given "
+"revision\n"
+"                     identifier.\n"
+"rocks                Statement of optimism.\n"
+"selftest             Run internal test suite.\n"
+"shell-complete       Show appropriate completions for context.\n"
+"test-script          Run a shell-like test from a file.\n"
+"touching-revisions   Return revision-ids which affected a particular file.\n"
+"unknowns             List unknown files.\n"
+"wait-until-signalled Test helper for\n"
+"                     test_start_and_stop_bzr_subprocess_send_signal.\n"
+msgstr ""
+
+#: en/help_topics/hooks.txt:1
+msgid ""
+"\n"
+"Hooks\n"
+"====="
+msgstr ""
+
+#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
+msgid ""
+"Introduction\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:8
+msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
+msgstr ""
+
+#: en/help_topics/hooks.txt:10
+msgid "  yyy.hooks.install_named_hook(\"xxx\", ...)"
+msgstr ""
+
+#: en/help_topics/hooks.txt:12
+msgid ""
+"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
+msgstr ""
+
+#: en/help_topics/hooks.txt:14
+msgid ""
+"The class that contains each hook is given before the hooks it supplies. "
+"For\n"
+"instance, BranchHooks as the class is the hooks class for\n"
+"`bzrlib.branch.Branch.hooks`."
+msgstr ""
+
+#: en/help_topics/hooks.txt:18
+msgid ""
+"Each description also indicates whether the hook runs on the client (the\n"
+"machine where bzr was invoked) or the server (the machine addressed by\n"
+"the branch URL).  These may be, but are not necessarily, the same machine."
+msgstr ""
+
+#: en/help_topics/hooks.txt:22
+msgid ""
+"Plugins (including hooks) are run on the server if all of these is true:"
+msgstr ""
+
+#: en/help_topics/hooks.txt:24
+msgid ""
+"  * The connection is via a smart server (accessed with a URL starting with\n"
+"    \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
+"\"http://\"\n"
+"    URL when a smart server is available via HTTP)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:28
+msgid ""
+"  * The hook is either server specific or part of general infrastructure "
+"rather\n"
+"    than client specific code (such as commit)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:31
+msgid ""
+"\n"
+"BranchHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:35
+msgid ""
+"automatic_tag_name\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
+#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
+msgid "Introduced in: 2.2"
+msgstr ""
+
+#: en/help_topics/hooks.txt:40
+msgid ""
+"Called to determine an automatic tag name for a revision.\n"
+"automatic_tag_name is called with (branch, revision_id) and should\n"
+"return a tag name or None if no tag name could be determined. The\n"
+"first non-None tag name returned will be used."
+msgstr ""
+
+#: en/help_topics/hooks.txt:45
+msgid ""
+"open\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
+#: en/help_topics/hooks.txt:304
+msgid "Introduced in: 1.8"
+msgstr ""
+
+#: en/help_topics/hooks.txt:50
+msgid ""
+"Called with the Branch object that has been opened after a branch is\n"
+"opened."
+msgstr ""
+
+#: en/help_topics/hooks.txt:53
+msgid ""
+"post_branch_init\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:58
+msgid ""
+"Called after new branch initialization completes. post_branch_init is\n"
+"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
+"branch and checkout (both heavyweight and lightweight) will all\n"
+"trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:63
+msgid ""
+"post_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
+msgid "Introduced in: 1.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:68
+msgid ""
+"Called in bzr client and server after a change to the tip of a branch\n"
+"is made. post_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
+msgid ""
+"post_commit\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
+#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
+#: en/help_topics/hooks.txt:145
+msgid "Introduced in: 0.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:78
+msgid ""
+"Called in the bzr client after a commit has completed. post_commit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
+"branch."
+msgstr ""
+
+#: en/help_topics/hooks.txt:83
+msgid ""
+"post_pull\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:88
+msgid ""
+"Called after a pull operation completes. post_pull is called with a\n"
+"bzrlib.branch.PullResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:91
+msgid ""
+"post_push\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:96
+msgid ""
+"Called after a push operation completes. post_push is called with a\n"
+"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
+msgstr ""
+
+#: en/help_topics/hooks.txt:99
+msgid ""
+"post_switch\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:104
+msgid ""
+"Called after a checkout switches branch. post_switch is called with a\n"
+"bzrlib.branch.SwitchHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:107
+msgid ""
+"post_uncommit\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:112
+msgid ""
+"Called in the bzr client after an uncommit completes. post_uncommit is\n"
+"called with (local, master, old_revno, old_revid, new_revno,\n"
+"new_revid) where local is the local branch or None, master is the\n"
+"target branch, and an empty branch receives new_revno of 0, new_revid\n"
+"of None."
+msgstr ""
+
+#: en/help_topics/hooks.txt:118
+msgid ""
+"pre_change_branch_tip\n"
+"~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:121
+msgid "Introduced in: 1.6"
+msgstr ""
+
+#: en/help_topics/hooks.txt:123
+msgid ""
+"Called in bzr client and server before a change to the tip of a branch\n"
+"is made. pre_change_branch_tip is called with a\n"
+"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
+"uncommit will all trigger this hook."
+msgstr ""
+
+#: en/help_topics/hooks.txt:128
+msgid ""
+"pre_commit\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:131
+msgid "Introduced in: 0.91"
+msgstr ""
+
+#: en/help_topics/hooks.txt:133
+msgid ""
+"Called after a commit is calculated but before it is completed.\n"
+"pre_commit is called with (local, master, old_revno, old_revid,\n"
+"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
+"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
+"TreeDelta object describing changes from the basis revision. hooks\n"
+"MUST NOT modify this delta.  future_tree is an in-memory tree obtained\n"
+"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
+"tree."
+msgstr ""
+
+#: en/help_topics/hooks.txt:142
+msgid ""
+"set_rh\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:147
+msgid ""
+"Invoked whenever the revision history has been set via\n"
+"set_revision_history. The api signature is (branch, revision_history),\n"
+"and the branch will be write-locked. The set_rh hook can be expensive\n"
+"for bzr to trigger, a better hook to use is\n"
+"Branch.post_change_branch_tip."
+msgstr ""
+
+#: en/help_topics/hooks.txt:153
+msgid ""
+"transform_fallback_location\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:156
+msgid "Introduced in: 1.9"
+msgstr ""
+
+#: en/help_topics/hooks.txt:158
+msgid ""
+"Called when a stacked branch is activating its fallback locations.\n"
+"transform_fallback_location is called with (branch, url), and should\n"
+"return a new url. Returning the same url allows it to be used as-is,\n"
+"returning a different one can be used to cause the branch to stack on\n"
+"a closer copy of that fallback_location. Note that the branch cannot\n"
+"have history accessing methods called on it during this hook because\n"
+"the fallback locations have not been activated. When there are\n"
+"multiple hooks installed for transform_fallback_location, all are\n"
+"called with the url returned from the previous hook.The order is\n"
+"however undefined."
+msgstr ""
+
+#: en/help_topics/hooks.txt:169
+msgid ""
+"CommandHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:172
+msgid ""
+"extend_command\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:175
+msgid "Introduced in: 1.13"
+msgstr ""
+
+#: en/help_topics/hooks.txt:177
+msgid ""
+"Called after creating a command object to allow modifications such as\n"
+"adding or removing options, docs etc. Called with the new\n"
+"bzrlib.commands.Command object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:181
+msgid ""
+"get_command\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
+#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
+msgid "Introduced in: 1.17"
+msgstr ""
+
+#: en/help_topics/hooks.txt:186
+msgid ""
+"Called when creating a single command. Called with (cmd_or_None,\n"
+"command_name). get_command should either return the cmd_or_None\n"
+"parameter, or a replacement Command object that should be used for the\n"
+"command. Note that the Command.hooks hooks are core infrastructure.\n"
+"Many users will prefer to use bzrlib.commands.register_command or\n"
+"plugin_cmds.register_lazy."
+msgstr ""
+
+#: en/help_topics/hooks.txt:193
+msgid ""
+"get_missing_command\n"
+"~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:198
+msgid ""
+"Called when creating a single command if no command could be found.\n"
+"Called with (command_name). get_missing_command should either return\n"
+"None, or a Command object to be used for the command."
+msgstr ""
+
+#: en/help_topics/hooks.txt:202
+msgid ""
+"list_commands\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:207
+msgid ""
+"Called when enumerating commands. Called with a set of cmd_name\n"
+"strings for all the commands found so far. This set  is safe to mutate\n"
+"- e.g. to remove a command. list_commands should return the updated\n"
+"set of command names."
+msgstr ""
+
+#: en/help_topics/hooks.txt:212
+msgid ""
+"_ConfigHooks\n"
+"------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:215
+msgid ""
+"get\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
+#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
+#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
+#: en/help_topics/hooks.txt:443
+msgid "Introduced in: 2.4"
+msgstr ""
+
+#: en/help_topics/hooks.txt:220
+msgid ""
+"Invoked when a config option is read. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:223
+msgid ""
+"load\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:228
+msgid "Invoked when a config store is loaded. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:230
+msgid ""
+"remove\n"
+"~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:235
+msgid ""
+"Invoked when a config option is removed. The signature is (stack,\n"
+"name)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:238
+msgid ""
+"save\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:243
+msgid "Invoked when a config store is saved. The signature is (store)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:245
+msgid ""
+"set\n"
+"~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:250
+msgid ""
+"Invoked when a config option is set. The signature is (stack, name,\n"
+"value)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:253
+msgid ""
+"ControlDirHooks\n"
+"---------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:256
+msgid ""
+"post_repo_init\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:261
+msgid ""
+"Invoked after a repository has been initialized. post_repo_init is\n"
+"called with a bzrlib.controldir.RepoInitHookParams."
+msgstr ""
+
+#: en/help_topics/hooks.txt:264
+msgid ""
+"pre_open\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:267
+msgid "Introduced in: 1.14"
+msgstr ""
+
+#: en/help_topics/hooks.txt:269
+msgid ""
+"Invoked before attempting to open a ControlDir with the transport that\n"
+"the open will use."
+msgstr ""
+
+#: en/help_topics/hooks.txt:272
+msgid ""
+"InfoHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:275
+msgid ""
+"repository\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
+#: en/help_topics/hooks.txt:521
+msgid "Introduced in: 1.15"
+msgstr ""
+
+#: en/help_topics/hooks.txt:280
+msgid ""
+"Invoked when displaying the statistics for a repository. repository is\n"
+"called with a statistics dictionary as returned by the repository and\n"
+"a file-like object to write to."
+msgstr ""
+
+#: en/help_topics/hooks.txt:284
+msgid ""
+"LockHooks\n"
+"---------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:287
+msgid ""
+"lock_acquired\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:292
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
+msgstr ""
+
+#: en/help_topics/hooks.txt:294
+msgid ""
+"lock_broken\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:299
+msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
+msgstr ""
+
+#: en/help_topics/hooks.txt:301
+msgid ""
+"lock_released\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:306
+msgid ""
+"Called with a bzrlib.lock.LockResult when a physical lock is released."
+msgstr ""
+
+#: en/help_topics/hooks.txt:308
+msgid ""
+"MergeHooks\n"
+"----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:311
+msgid ""
+"merge_file_content\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:314
+msgid "Introduced in: 2.1"
+msgstr ""
+
+#: en/help_topics/hooks.txt:316
+msgid ""
+"Called with a bzrlib.merge.Merger object to create a per file merge\n"
+"object when starting a merge. Should return either None or a subclass\n"
+"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
+"called per file that needs to be merged (including when one side has\n"
+"deleted the file and the other has changed it). See the\n"
+"AbstractPerFileMerger API docs for details on how it is used by merge."
+msgstr ""
+
+#: en/help_topics/hooks.txt:323
+msgid ""
+"post_merge\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
+#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
+#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
+msgid "Introduced in: 2.5"
+msgstr ""
+
+#: en/help_topics/hooks.txt:328
+msgid ""
+"Called after a merge. Receives a Merger object as the single argument.\n"
+"The return value is ignored."
+msgstr ""
+
+#: en/help_topics/hooks.txt:331
+msgid ""
+"pre_merge\n"
+"~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:336
+msgid ""
+"Called before a merge. Receives a Merger object as the single\n"
+"argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:339
+msgid ""
+"MergeDirectiveHooks\n"
+"-------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:342
+msgid ""
+"merge_request_body\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:345
+msgid "Introduced in: 1.15.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:347
+msgid ""
+"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
+"request.  Callbacks must return a body.  If more than one callback is\n"
+"registered, the output of one callback is provided to the next."
+msgstr ""
+
+#: en/help_topics/hooks.txt:351
+msgid ""
+"MessageEditorHooks\n"
+"------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:354
+msgid ""
+"commit_message_template\n"
+"~~~~~~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:357
+msgid "Introduced in: 1.10"
+msgstr ""
+
+#: en/help_topics/hooks.txt:359
+msgid ""
+"Called when a commit message is being generated.\n"
+"commit_message_template is called with the bzrlib.commit.Commit object\n"
+"and the message that is known so far. commit_message_template must\n"
+"return a new message to use (which could be the same as it was given).\n"
+"When there are multiple hooks registered for commit_message_template,\n"
+"they are chained with the result from the first passed into the\n"
+"second, and so on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:367
+msgid ""
+"set_commit_message\n"
+"~~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:372
+msgid ""
+"Set a fixed commit message. set_commit_message is called with the\n"
+"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
+"properties by editing commit.builder._revprops) and the message so\n"
+"far. set_commit_message must return the message to use or None if it\n"
+"should use the message editor as normal."
+msgstr ""
+
+#: en/help_topics/hooks.txt:378
+msgid ""
+"MutableTreeHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:381
+msgid ""
+"post_build_tree\n"
+"~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:386
+msgid ""
+"Called after a completely new tree is built. The hook is called with\n"
+"the tree as its only argument."
+msgstr ""
+
+#: en/help_topics/hooks.txt:392
+msgid "Introduced in: 2.0"
+msgstr ""
+
+#: en/help_topics/hooks.txt:394
+msgid ""
+"Called after a commit is performed on a tree. The hook is called with\n"
+"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
+"commit was performed on is available via the mutable_tree attribute of\n"
+"that object."
+msgstr ""
+
+#: en/help_topics/hooks.txt:399
+msgid ""
+"post_transform\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:404
+msgid ""
+"Called after a tree transform has been performed on a tree. The hook\n"
+"is called with the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:407
+msgid ""
+"pre_transform\n"
+"~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:412
+msgid ""
+"Called before a tree transform on this tree. The hook is called with\n"
+"the tree that is being transformed and the transform."
+msgstr ""
+
+#: en/help_topics/hooks.txt:415
+msgid ""
+"start_commit\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:420
+msgid ""
+"Called before a commit is performed on a tree. The start commit hook\n"
+"is able to change the tree before the commit takes place. start_commit\n"
+"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
+"being performed on."
+msgstr ""
+
+#: en/help_topics/hooks.txt:425
+msgid ""
+"SmartClientHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:428
+msgid ""
+"call\n"
+"~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:431
+msgid "Introduced in: unknown"
+msgstr ""
+
+#: en/help_topics/hooks.txt:433
+msgid ""
+"Called when the smart client is submitting a request to the smart\n"
+"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
+"Streaming request bodies, and responses, are not accessible."
+msgstr ""
+
+#: en/help_topics/hooks.txt:437
+msgid ""
+"SmartServerHooks\n"
+"----------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:440
+msgid ""
+"server_exception\n"
+"~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:445
+msgid ""
+"Called by the bzr server when an exception occurs. server_exception is\n"
+"called with the sys.exc_info() tuple return true for the hook if the\n"
+"exception has been handled, in which case the server will exit\n"
+"normally."
+msgstr ""
+
+#: en/help_topics/hooks.txt:450
+msgid ""
+"server_started\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
+msgid "Introduced in: 0.16"
+msgstr ""
+
+#: en/help_topics/hooks.txt:455
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing urls, public url), where\n"
+"backing_url is a list of URLs giving the server-specific directory\n"
+"locations, and public_url is the public URL for the directory being\n"
+"served."
+msgstr ""
+
+#: en/help_topics/hooks.txt:461
+msgid ""
+"server_started_ex\n"
+"~~~~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:466
+msgid ""
+"Called by the bzr server when it starts serving a directory.\n"
+"server_started is called with (backing_urls, server_obj)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:469
+msgid ""
+"server_stopped\n"
+"~~~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:474
+msgid ""
+"Called by the bzr server when it stops serving a directory.\n"
+"server_stopped is called with the same parameters as the\n"
+"server_started hook: (backing_urls, public_url)."
+msgstr ""
+
+#: en/help_topics/hooks.txt:478
+msgid ""
+"StatusHooks\n"
+"-----------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:481
+msgid ""
+"post_status\n"
+"~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
+msgid "Introduced in: 2.3"
+msgstr ""
+
+#: en/help_topics/hooks.txt:486
+msgid ""
+"Called with argument StatusHookParams after Bazaar has displayed the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:492
+msgid ""
+"pre_status\n"
+"~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:497
+msgid ""
+"Called with argument StatusHookParams before Bazaar displays the\n"
+"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
+"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
+"correspond to the command line options specified by the user for the\n"
+"status command. to_file is the output stream for writing."
+msgstr ""
+
+#: en/help_topics/hooks.txt:503
+msgid ""
+"TransportHooks\n"
+"--------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:506
+msgid ""
+"post_connect\n"
+"~~~~~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:511
+msgid ""
+"Called after a new connection is established or a reconnect occurs.\n"
+"The sole argument passed is either the connected transport or smart\n"
+"medium instance."
+msgstr ""
+
+#: en/help_topics/hooks.txt:515
+msgid ""
+"RioVersionInfoBuilderHooks\n"
+"--------------------------"
+msgstr ""
+
+#: en/help_topics/hooks.txt:518
+msgid ""
+"revision\n"
+"~~~~~~~~"
+msgstr ""
+
+#: en/help_topics/hooks.txt:523
+msgid ""
+"Invoked when adding information about a revision to the RIO stanza\n"
+"that is printed. revision is called with a revision object and a RIO\n"
+"stanza.\n"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:1
+msgid ""
+"Location aliases\n"
+"================"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:4
+msgid ""
+"Bazaar defines several aliases for locations associated with a branch.  "
+"These\n"
+"can be used with most commands that expect a location, such as `bzr push`."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:7
+msgid "The aliases are::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:9
+msgid ""
+"  :bound     The branch this branch is bound to, for bound branches.\n"
+"  :parent    The parent of this branch.\n"
+"  :public    The public location of this branch.\n"
+"  :push      The saved location used for `bzr push` with no arguments.\n"
+"  :submit    The submit branch for this branch.\n"
+"  :this      This branch."
+msgstr ""
+
+#: en/help_topics/location-alias.txt:16
+msgid "For example, to push to the parent location::"
+msgstr ""
+
+#: en/help_topics/location-alias.txt:18
+msgid "    bzr push :parent\n"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:1
+msgid ""
+"Log Formats\n"
+"==========="
+msgstr ""
+
+#: en/help_topics/log-formats.txt:4
+msgid ""
+"A log format controls how information about each revision is displayed.\n"
+"The standard log formats are compared below::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:7
+msgid ""
+"  Feature                 long           short         line\n"
+"  ----------------------  -------------  ------------  -------------------\n"
+"  design goal             detailed view  concise view  1 revision per line\n"
+"  committer               name+email     name only     name only\n"
+"  author                  name+email     -             -\n"
+"  date-time format        full           date only     date only\n"
+"  commit message          full           full          top line\n"
+"  tags                    yes            yes           yes\n"
+"  merges indicator        -              yes           -\n"
+"  status/delta            optional       optional      -\n"
+"  diff/patch              optional       optional      -\n"
+"  revision-id             optional       optional      -\n"
+"  branch nick             yes            -             -\n"
+"  foreign vcs properties  yes            yes           -\n"
+"  preferred levels        all            1             1\n"
+"  digital signature       optional       -             -"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:24
+msgid ""
+"The default format is ``long``. To change this, define the ``log_format``\n"
+"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:27
+msgid ""
+"  [DEFAULT]\n"
+"  log_format = short"
+msgstr ""
+
+#: en/help_topics/log-formats.txt:30
+msgid ""
+"Alternatively, to change the log format used for a given query, use the\n"
+"--long, --short or --line options."
+msgstr ""
+
+#: en/help_topics/log-formats.txt:33
+msgid ""
+"If one of the standard log formats does not meet your needs, additional\n"
+"formats can be provided by plugins.\n"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:1
+msgid "Other Storage Formats"
+msgstr ""
+
+#: en/help_topics/other-formats.txt:3
+msgid "Experimental formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:5
+msgid ""
+":development-colo:\n"
+"    (native) The 2a format with experimental support for colocated\n"
+"    branches."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:9
+msgid ""
+"\n"
+"Deprecated formats are shown below."
+msgstr ""
+
+#: en/help_topics/other-formats.txt:12
+msgid ""
+":pack-0.92:\n"
+"    (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
+"    Interoperates with bzr repositories before 0.92 but cannot be read\n"
+"    by bzr < 0.92."
+msgstr ""
+
+#: en/help_topics/patterns.txt:1
+msgid ""
+"Patterns\n"
+"========"
+msgstr ""
+
+#: en/help_topics/patterns.txt:4
+msgid ""
+"Bazaar uses patterns to match files at various times. For example,\n"
+"the ``add`` command skips over files that match ignore patterns\n"
+"and preferences can be associated with files using rule patterns.\n"
+"The pattern syntax is described below."
+msgstr ""
+
+#: en/help_topics/patterns.txt:9
+msgid ""
+"Trailing slashes on patterns are ignored. If the pattern contains a\n"
+"slash or is a regular expression, it is compared to the whole path\n"
+"from the branch root. Otherwise, it is compared to only the last\n"
+"component of the path. To match a file only in the root directory,\n"
+"prepend ``./``. Patterns specifying absolute paths are not allowed."
+msgstr ""
+
+#: en/help_topics/patterns.txt:15
+msgid "Patterns may include globbing wildcards such as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:17
+msgid ""
+"  ? - Matches any single character except '/'\n"
+"  * - Matches 0 or more characters except '/'\n"
+"  /**/ - Matches 0 or more directories in a path\n"
+"  [a-z] - Matches a single character from within a group of characters"
+msgstr ""
+
+#: en/help_topics/patterns.txt:22
+msgid ""
+"Patterns may also be `Python regular expressions`_. Regular expression\n"
+"patterns are identified by a ``RE:`` prefix followed by the regular\n"
+"expression.  Regular expression patterns may not include named or\n"
+"numbered groups."
+msgstr ""
+
+#: en/help_topics/patterns.txt:27
+msgid ""
+"Case insensitive ignore patterns can be specified with regular expressions\n"
+"by using the ``i`` (for ignore case) flag in the pattern."
+msgstr ""
+
+#: en/help_topics/patterns.txt:30
+msgid ""
+"For example, a case insensitive match for ``foo`` may be specified as::"
+msgstr ""
+
+#: en/help_topics/patterns.txt:32
+msgid "  RE:(?i)foo"
+msgstr ""
+
+#: en/help_topics/patterns.txt:34
+msgid ""
+"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
+"matched by that pattern will not be ignored."
+msgstr ""
+
+#: en/help_topics/patterns.txt:37
+msgid ""
+".. _Python regular expressions: http://docs.python.org/library/re.html"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:1
+msgid "Revision Identifiers"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:3
+msgid ""
+"A revision identifier refers to a specific state of a branch's history.  It\n"
+"can be expressed in several ways.  It can begin with a keyword to\n"
+"unambiguously specify a given lookup type; some examples are 'last:1',\n"
+"'before:yesterday' and 'submit:'."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:8
+msgid ""
+"Alternately, it can be given without a keyword, in which case it will be\n"
+"checked as a revision number, a tag, a revision id, a date specification, or "
+"a\n"
+"branch specification, in that order.  For example, 'date:today' could be\n"
+"written as simply 'today', though if you have a tag called 'today' that "
+"will\n"
+"be found first."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:14
+msgid ""
+"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
+"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
+"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
+"or\n"
+"spaces around the '..')."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:19
+msgid ""
+"Ranges are interpreted differently by different commands. To the \"log\" "
+"command,\n"
+"a range is a sequence of log messages, but to the \"diff\" command, the "
+"range\n"
+"denotes a change between revisions (and not a sequence of changes).  In\n"
+"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
+"consider it\n"
+"to be open-ended, that is, they include one end but not the other.  For "
+"example:\n"
+"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
+"3649,\n"
+"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
+"and\n"
+"3649, but not 3647."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:28
+msgid "The keywords used as revision selection methods are the following:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:30
+msgid ""
+":revid:\n"
+"\tSelects a revision using the revision id.\n"
+":submit:\n"
+"\tSelects a common ancestor with the submit branch.\n"
+":ancestor:\n"
+"\tSelects a common ancestor with a second branch.\n"
+":date:\n"
+"\tSelects a revision on the basis of a datestamp.\n"
+":branch:\n"
+"\tSelects the last revision of a specified branch.\n"
+":tag:\n"
+"\tSelects a revision identified by a tag name.\n"
+":revno:\n"
+"\tSelects a revision using a number.\n"
+":before:\n"
+"\tSelects the parent of the revision specified.\n"
+":annotate:\n"
+"\tSelect the revision that last modified the specified line.\n"
+":mainline:\n"
+"\tSelect mainline revision that merged the specified revision.\n"
+":last:\n"
+"\tSelects the nth revision from the end."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:53
+msgid "In addition, plugins can provide other keywords."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:55
+msgid "A detailed description of each keyword is given below."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:57
+msgid ":revid:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:59
+msgid ""
+"    Supply a specific revision id, that can be used to specify any\n"
+"    revision id in the ancestry of the branch.\n"
+"    Including merges, and pending merges.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:64
+msgid ""
+"      revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:66
+msgid ":submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:68
+msgid ""
+"    Diffing against this shows all the changes that were made in this "
+"branch,\n"
+"    and is a good predictor of what merge will do.  The submit branch is\n"
+"    used by the bundle and merge directive commands.  If no submit branch\n"
+"    is specified, the parent branch is used instead."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
+msgid ""
+"    The common ancestor is the last revision that existed in both\n"
+"    branches. Usually this is the branch point, but it could also be\n"
+"    a revision that was merged."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
+#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
+#: en/help_topics/revisionspec.txt:153
+msgid "    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:79
+msgid "      $ bzr diff -r submit:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:81
+msgid ":ancestor:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:83
+msgid "    Supply the path to a branch to select the common ancestor."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:89
+msgid ""
+"    This is frequently used with 'diff' to return all of the changes\n"
+"    that your branch introduces, while excluding the changes that you\n"
+"    have not merged from the remote branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:95
+msgid ""
+"      ancestor:/path/to/branch\n"
+"      $ bzr diff -r ancestor:../../mainline/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:98
+msgid ":date:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:100
+msgid ""
+"    Supply a datestamp to select the first revision that matches the date.\n"
+"    Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
+"    Matches the first entry after a given date (either at midnight or\n"
+"    at a specified time)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:105
+msgid "    One way to display all the changes since yesterday would be::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:107
+msgid "        bzr log -r date:yesterday.."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:111
+msgid ""
+"      date:yesterday            -> select the first revision since "
+"yesterday\n"
+"      date:2006-08-14,17:10:14  -> select the first revision after\n"
+"                                   August 14th, 2006 at 5:10pm."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:115
+msgid ":branch:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:117
+msgid "    Supply the path to a branch to select its last revision."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:121
+msgid "      branch:/path/to/branch"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:123
+msgid ":tag:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:125
+msgid "    Tags are stored in the branch and created by the 'tag' command."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:127
+msgid ":revno:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:129
+msgid ""
+"    Use an integer to specify a revision in the history of the branch.\n"
+"    Optionally a branch can be specified.  A negative number will count\n"
+"    from the end of the branch (-1 is the last revision, -2 the previous\n"
+"    one). If the negative number is larger than the branch's history, the\n"
+"    first revision is returned.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:136
+msgid ""
+"      revno:1                   -> return the first revision of this branch\n"
+"      revno:3:/path/to/branch   -> return the 3rd revision of\n"
+"                                   the branch '/path/to/branch'\n"
+"      revno:-1                  -> The last revision in a branch.\n"
+"      -2:http://other/branch    -> The second to last revision in the\n"
+"                                   remote branch.\n"
+"      -1000000                  -> Most likely the first revision, unless\n"
+"                                   your history is very long."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:145
+msgid ":before:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:147
+msgid ""
+"    Supply any revision spec to return the parent of that revision.  This "
+"is\n"
+"    mostly useful when inspecting revisions that are not in the revision "
+"history\n"
+"    of a branch."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:151
+msgid ""
+"    It is an error to request the parent of the null revision (before:0)."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:155
+msgid ""
+"      before:1913    -> Return the parent of revno 1913 (revno 1912)\n"
+"      before:revid:aaaa@bbbb-1234567890  -> return the parent of revision\n"
+"                                            aaaa@bbbb-1234567890\n"
+"      bzr diff -r before:1913..1913\n"
+"            -> Find the changes between revision 1913 and its parent "
+"(1912).\n"
+"               (What changes did revision 1913 introduce).\n"
+"               This is equivalent to:  bzr diff -c 1913"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:163
+msgid ":annotate:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:165
+msgid ""
+"    Select the revision that last modified the specified line.  Line is\n"
+"    specified as path:number.  Path is a relative path to the file.  "
+"Numbers\n"
+"    start at 1, and are relative to the current version, not the last-\n"
+"    committed version of the file."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:170
+msgid ":mainline:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:172
+msgid ""
+"    Select the revision that merged the specified revision into mainline."
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:174
+msgid ":last:"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:176
+msgid ""
+"    Supply a positive number to get the nth revision from the end.\n"
+"    This is the same as supplying negative numbers to the 'revno:' spec.\n"
+"    Examples::"
+msgstr ""
+
+#: en/help_topics/revisionspec.txt:180
+msgid ""
+"      last:1        -> return the last revision\n"
+"      last:3        -> return the revision 2 before the end.\n"
+msgstr ""
+
+#: en/help_topics/rules.txt:1
+msgid ""
+"Rules\n"
+"====="
+msgstr ""
+
+#: en/help_topics/rules.txt:7
+msgid ""
+"Rules are defined in ini file format where the sections are file glob\n"
+"patterns and the contents of each section are the preferences for files\n"
+"matching that pattern(s). For example::"
+msgstr ""
+
+#: en/help_topics/rules.txt:11
+msgid ""
+"    [name *.bat]\n"
+"    eol = native"
+msgstr ""
+
+#: en/help_topics/rules.txt:14
+msgid ""
+"    [name *.html *.xml]\n"
+"    keywords = xml_escape"
+msgstr ""
+
+#: en/help_topics/rules.txt:17
+msgid ""
+"Preferences like these are useful for commands and plugins wishing to\n"
+"provide custom behaviour for selected files.  For more information on \n"
+"end of line conversion see :doc:`eol-help`.\n"
+"Keyword support is provided by the `keywords plugin\n"
+"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
+msgstr ""
+
+#: en/help_topics/rules.txt:23
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+
+#: en/help_topics/rules.txt:26
+msgid ""
+"Default rules for all branches are defined in the optional file\n"
+"``BZR_HOME/rules``. "
+msgstr ""
+
+#: en/help_topics/rules.txt:29
+msgid ""
+"Rule Patterns\n"
+"-------------"
+msgstr ""
+
+#: en/help_topics/rules.txt:32
+msgid ""
+"Patterns are ordered and searching stops as soon as one matches.\n"
+"As a consequence, more explicit patterns should be placed towards\n"
+"the top of the file. Rule patterns use exactly the same conventions\n"
+"as ignore patterns. See :doc:`patterns-help` for details."
+msgstr ""
+
+#: en/help_topics/rules.txt:37
+msgid ".. note::"
+msgstr ""
+
+#: en/help_topics/rules.txt:39
+msgid ""
+"   Patterns containing square brackets or spaces should be\n"
+"   surrounded in quotes to ensure they are correctly parsed.\n"
+msgstr ""
+
+#: en/help_topics/topics.txt:1
+msgid ""
+"authentication       Information on configuring authentication\n"
+"basic                Basic commands\n"
+"branches             Information on what a branch is\n"
+"bugs                 Bug tracker settings\n"
+"checkouts            Information on what a checkout is\n"
+"commands             Basic help for all commands\n"
+"configuration        Details on the configuration settings available\n"
+"conflict-types       Types of conflicts and what to do about them\n"
+"content-filters      Conversion of content into/from working trees\n"
+"criss-cross          Information on criss-cross merging\n"
+"current-formats      Current storage formats\n"
+"debug-flags          Options to show or record debug information\n"
+"diverged-branches    How to fix diverged branches\n"
+"env-variables        Environment variable names and values\n"
+"eol                  Information on end-of-line handling\n"
+"files                Information on configuration and log files\n"
+"formats              Information on choosing a storage format\n"
+"global-options       Options that control how Bazaar runs\n"
+"hidden-commands      All hidden commands\n"
+"hooks                Points at which custom processing can be added\n"
+"launchpad            Using Bazaar with Launchpad.net\n"
+"location-alias       Aliases for remembered locations\n"
+"log-formats          Details on the logging formats available\n"
+"other-formats        Experimental and deprecated storage formats\n"
+"patterns             Information on the pattern syntax\n"
+"repositories         Basic information on shared repositories.\n"
+"revisionspec         Explain how to use --revision\n"
+"rules                Information on defining rule-based preferences\n"
+"standalone-trees     Information on what a standalone tree is\n"
+"standard-options     Options that can be used with any command\n"
+"status-flags         Help on status flags\n"
+"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
+"topics               Topics list\n"
+"url-special-chars    Special character handling in URLs\n"
+"urlspec              Supported transport protocols\n"
+"working-trees        Information on working trees\n"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:1
+msgid ""
+"Special character handling in URLs\n"
+"=================================="
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:4
+msgid "Bazaar allows locations to be specified in multiple ways, either:"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:6
+msgid " * Fully qualified URLs"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:8
+msgid " * File system paths, relative or absolute"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:10
+msgid ""
+"Internally bzr treats all locations as URLs. For any file system paths\n"
+"that are specified it will automatically determine the appropriate URL\n"
+"representation, and escape special characters where necessary."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:14
+msgid ""
+"There are a few characters which have special meaning in URLs and need "
+"careful\n"
+"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
+"value in URLs. Any non-ASCII characters in a file path will automatically "
+"be\n"
+"urlencoded when the path is converted to a URL."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:19
+msgid ""
+"URLs represent non-ASCII characters in an encoding defined by the server, "
+"but\n"
+"usually UTF-8.  The % escapes should be of the UTF-8 bytes.  Bazaar tries to "
+"be\n"
+"generous in what it accepts as a URL and to print them in a way that\n"
+"will be readable."
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:24
+msgid ""
+"For example, if you have a directory named '/tmp/%2False' these are all "
+"valid\n"
+"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
+"slash)::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:27
+msgid ""
+"  cd /tmp\n"
+"  bzr log /tmp/%2False\n"
+"  bzr log %2False\n"
+"  bzr log file:///tmp/%252False\n"
+"  bzr log file://localhost/tmp/%252False\n"
+"  bzr log file:%252False"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:34
+msgid "These are valid but do not refer to the same file::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:36
+msgid ""
+"  bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
+"  bzr log %252False (refers to a file called /tmp/%252False)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:39
+msgid ""
+"Comma also has special meaning in URLs, because it denotes `segment "
+"parameters`_"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:41
+msgid ""
+"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:43
+msgid ""
+"Comma is also special in any file system paths that are specified. To use a "
+"literal\n"
+"comma in a file system path, specify a URL and URL encode the comma::"
+msgstr ""
+
+#: en/help_topics/url-special-chars.txt:46
+msgid ""
+"  bzr log foo,branch=bla # path \"foo\" with the segment parameter "
+"\"branch\" set to \"bla\"\n"
+"  bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
+"  bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
+"\"branch\" set to \"bla\"\n"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:1
+msgid "URL Identifiers"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:3
+msgid "Supported URL prefixes::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:5
+msgid ""
+"  aftp://             Access using active FTP.\n"
+"  bzr://              Fast access using the Bazaar smart server.\n"
+"  bzr+ssh://          Fast access using the Bazaar smart server over SSH.\n"
+"  file://             Access using the standard filesystem (default)\n"
+"  ftp://              Access using passive FTP.\n"
+"  http://             Read-only access of branches exported on the web.\n"
+"  https://            Read-only access of branches exported on the web using "
+"SSL.\n"
+"  sftp://             Access using SFTP (most SSH servers provide SFTP)."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:14
+msgid "Supported modifiers::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:16
+msgid "  gio+                Access using any GIO supported protocols."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:18
+msgid "Bazaar supports all of the standard parts within the URL::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:20
+msgid "  <protocol>://[user[:password]@]host[:port]/[path]"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:22
+msgid "allowing URLs such as::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:24
+msgid "  http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:26
+msgid ""
+"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
+"with '~' as meaning that the rest of the path should be interpreted\n"
+"relative to the remote user's home directory.  For example if the user\n"
+"``remote`` has a  home directory of ``/home/remote`` on the server\n"
+"shell.example.com, then::"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:32
+msgid "  bzr+ssh://remote@shell.example.com/~/myproject/trunk"
+msgstr ""
+
+#: en/help_topics/urlspec.txt:34
+msgid "would refer to ``/home/remote/myproject/trunk``."
+msgstr ""
+
+#: en/help_topics/urlspec.txt:36
+msgid ""
+"Many commands that accept URLs also accept location aliases too.\n"
+"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
+msgstr ""